Commit e44f513e authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Fix the gen_snapshot path for a local_engine FLX build in debug mode (#8754)

gen_snapshot is now used for both JIT and AOT snapshots.  The JIT version
used in debug mode will be a 64-bit binary.
parent 2148e9af
...@@ -89,7 +89,6 @@ class CachedArtifacts extends Artifacts { ...@@ -89,7 +89,6 @@ class CachedArtifacts extends Artifacts {
case TargetPlatform.darwin_x64: case TargetPlatform.darwin_x64:
case TargetPlatform.linux_x64: case TargetPlatform.linux_x64:
case TargetPlatform.windows_x64: case TargetPlatform.windows_x64:
assert(mode == null, 'Platform $platform does not support different build modes.');
return _getHostArtifactPath(artifact, platform); return _getHostArtifactPath(artifact, platform);
} }
assert(false, 'Invalid platform $platform.'); assert(false, 'Invalid platform $platform.');
...@@ -221,7 +220,7 @@ class LocalEngineArtifacts extends Artifacts { ...@@ -221,7 +220,7 @@ class LocalEngineArtifacts extends Artifacts {
final String abi = _getAbiDirectory(platform); final String abi = _getAbiDirectory(platform);
return fs.path.join(engineOutPath, 'gen', 'flutter', 'shell', 'platform', 'android', 'android', fs.path.join('android', 'libs', abi, _artifactToFileName(artifact))); return fs.path.join(engineOutPath, 'gen', 'flutter', 'shell', 'platform', 'android', 'android', fs.path.join('android', 'libs', abi, _artifactToFileName(artifact)));
case Artifact.genSnapshot: case Artifact.genSnapshot:
return _genSnapshotPath(platform); return _genSnapshotPath(platform, mode);
case Artifact.skyShell: case Artifact.skyShell:
return _skyShellPath(platform); return _skyShellPath(platform);
case Artifact.isolateSnapshotData: case Artifact.isolateSnapshotData:
...@@ -240,9 +239,9 @@ class LocalEngineArtifacts extends Artifacts { ...@@ -240,9 +239,9 @@ class LocalEngineArtifacts extends Artifacts {
return fs.path.basename(engineOutPath); return fs.path.basename(engineOutPath);
} }
String _genSnapshotPath(TargetPlatform platform) { String _genSnapshotPath(TargetPlatform platform, BuildMode mode) {
String clang; String clang;
if (platform == TargetPlatform.ios) { if (platform == TargetPlatform.ios || mode == BuildMode.debug) {
clang = 'clang_x64'; clang = 'clang_x64';
} else { } else {
clang = getCurrentHostPlatform() == HostPlatform.darwin_x64 ? 'clang_i386' : 'clang_x86'; clang = getCurrentHostPlatform() == HostPlatform.darwin_x64 ? 'clang_i386' : 'clang_x86';
......
...@@ -36,7 +36,7 @@ Future<int> createSnapshot({ ...@@ -36,7 +36,7 @@ Future<int> createSnapshot({
assert(mainPath != null); assert(mainPath != null);
assert(snapshotPath != null); assert(snapshotPath != null);
assert(packages != null); assert(packages != null);
final String snapshotterPath = artifacts.getArtifactPath(Artifact.genSnapshot); final String snapshotterPath = artifacts.getArtifactPath(Artifact.genSnapshot, null, BuildMode.debug);
final String vmSnapshotData = artifacts.getArtifactPath(Artifact.vmSnapshotData); final String vmSnapshotData = artifacts.getArtifactPath(Artifact.vmSnapshotData);
final String isolateSnapshotData = artifacts.getArtifactPath(Artifact.isolateSnapshotData); final String isolateSnapshotData = artifacts.getArtifactPath(Artifact.isolateSnapshotData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment