Unverified Commit 542feb47 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove unused Snapshot.dart artifact and associated code (#52821)

parent da0788a1
...@@ -18,7 +18,6 @@ enum Artifact { ...@@ -18,7 +18,6 @@ enum Artifact {
genSnapshot, genSnapshot,
/// The flutter tester binary. /// The flutter tester binary.
flutterTester, flutterTester,
snapshotDart,
flutterFramework, flutterFramework,
/// The framework directory of the macOS desktop. /// The framework directory of the macOS desktop.
flutterMacOSFramework, flutterMacOSFramework,
...@@ -73,8 +72,6 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo ...@@ -73,8 +72,6 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo
return 'gen_snapshot'; return 'gen_snapshot';
case Artifact.flutterTester: case Artifact.flutterTester:
return 'flutter_tester$exe'; return 'flutter_tester$exe';
case Artifact.snapshotDart:
return 'snapshot.dart';
case Artifact.flutterFramework: case Artifact.flutterFramework:
return 'Flutter.framework'; return 'Flutter.framework';
case Artifact.flutterMacOSFramework: case Artifact.flutterMacOSFramework:
...@@ -155,9 +152,8 @@ class EngineBuildPaths { ...@@ -155,9 +152,8 @@ class EngineBuildPaths {
// Manages the engine artifacts of Flutter. // Manages the engine artifacts of Flutter.
abstract class Artifacts { abstract class Artifacts {
static LocalEngineArtifacts getLocalEngine(String engineSrcPath, EngineBuildPaths engineBuildPaths) { static LocalEngineArtifacts getLocalEngine(EngineBuildPaths engineBuildPaths) {
return LocalEngineArtifacts( return LocalEngineArtifacts(
engineSrcPath,
engineBuildPaths.targetEngine, engineBuildPaths.targetEngine,
engineBuildPaths.hostEngine, engineBuildPaths.hostEngine,
cache: globals.cache, cache: globals.cache,
...@@ -247,7 +243,6 @@ class CachedArtifacts extends Artifacts { ...@@ -247,7 +243,6 @@ class CachedArtifacts extends Artifacts {
String _getIosArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) { String _getIosArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) {
switch (artifact) { switch (artifact) {
case Artifact.genSnapshot: case Artifact.genSnapshot:
case Artifact.snapshotDart:
case Artifact.flutterFramework: case Artifact.flutterFramework:
case Artifact.frontendServerSnapshotForEngineDartSdk: case Artifact.frontendServerSnapshotForEngineDartSdk:
final String artifactFileName = _artifactToFileName(artifact); final String artifactFileName = _artifactToFileName(artifact);
...@@ -441,7 +436,6 @@ HostPlatform _currentHostPlatformAsHost(Platform platform) { ...@@ -441,7 +436,6 @@ HostPlatform _currentHostPlatformAsHost(Platform platform) {
/// Manages the artifacts of a locally built engine. /// Manages the artifacts of a locally built engine.
class LocalEngineArtifacts extends Artifacts { class LocalEngineArtifacts extends Artifacts {
LocalEngineArtifacts( LocalEngineArtifacts(
this._engineSrcPath,
this.engineOutPath, this.engineOutPath,
this._hostEngineOutPath, { this._hostEngineOutPath, {
@required FileSystem fileSystem, @required FileSystem fileSystem,
...@@ -453,7 +447,6 @@ class LocalEngineArtifacts extends Artifacts { ...@@ -453,7 +447,6 @@ class LocalEngineArtifacts extends Artifacts {
_processManager = processManager, _processManager = processManager,
_platform = platform; _platform = platform;
final String _engineSrcPath;
final String engineOutPath; // TODO(goderbauer): This should be private. final String engineOutPath; // TODO(goderbauer): This should be private.
final String _hostEngineOutPath; final String _hostEngineOutPath;
final FileSystem _fileSystem; final FileSystem _fileSystem;
...@@ -466,8 +459,6 @@ class LocalEngineArtifacts extends Artifacts { ...@@ -466,8 +459,6 @@ class LocalEngineArtifacts extends Artifacts {
platform ??= _currentHostPlatform(_platform); platform ??= _currentHostPlatform(_platform);
final String artifactFileName = _artifactToFileName(artifact, platform, mode); final String artifactFileName = _artifactToFileName(artifact, platform, mode);
switch (artifact) { switch (artifact) {
case Artifact.snapshotDart:
return _fileSystem.path.join(_engineSrcPath, 'flutter', 'lib', 'snapshot', artifactFileName);
case Artifact.genSnapshot: case Artifact.genSnapshot:
return _genSnapshotPath(); return _genSnapshotPath();
case Artifact.flutterTester: case Artifact.flutterTester:
......
...@@ -281,7 +281,7 @@ class FlutterCommandRunner extends CommandRunner<void> { ...@@ -281,7 +281,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
final String enginePath = _findEnginePath(topLevelResults); final String enginePath = _findEnginePath(topLevelResults);
if (enginePath != null) { if (enginePath != null) {
contextOverrides.addAll(<Type, dynamic>{ contextOverrides.addAll(<Type, dynamic>{
Artifacts: Artifacts.getLocalEngine(enginePath, _findEngineBuildPath(topLevelResults, enginePath)), Artifacts: Artifacts.getLocalEngine(_findEngineBuildPath(topLevelResults, enginePath)),
}); });
} }
......
...@@ -87,7 +87,7 @@ void main() { ...@@ -87,7 +87,7 @@ void main() {
logger: BufferLogger.test(), logger: BufferLogger.test(),
osUtils: MockOperatingSystemUtils(), osUtils: MockOperatingSystemUtils(),
); );
artifacts = LocalEngineArtifacts(fileSystem.currentDirectory.path, artifacts = LocalEngineArtifacts(
fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'android_debug_unopt'), fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'android_debug_unopt'),
fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'host_debug_unopt'), fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'host_debug_unopt'),
cache: cache, cache: cache,
...@@ -128,7 +128,7 @@ void main() { ...@@ -128,7 +128,7 @@ void main() {
}); });
testWithoutContext('Looks up dart.exe on windows platforms', () async { testWithoutContext('Looks up dart.exe on windows platforms', () async {
artifacts = LocalEngineArtifacts(fileSystem.currentDirectory.path, artifacts = LocalEngineArtifacts(
fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'android_debug_unopt'), fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'android_debug_unopt'),
fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'host_debug_unopt'), fileSystem.path.join(fileSystem.currentDirectory.path, 'out', 'host_debug_unopt'),
cache: cache, cache: cache,
......
...@@ -241,11 +241,6 @@ void main() { ...@@ -241,11 +241,6 @@ void main() {
mockArtifacts = MockArtifacts(); mockArtifacts = MockArtifacts();
mockXcode = MockXcode(); mockXcode = MockXcode();
when(mockXcode.sdkLocation(any)).thenAnswer((_) => Future<String>.value(kSDKPath)); when(mockXcode.sdkLocation(any)).thenAnswer((_) => Future<String>.value(kSDKPath));
for (final BuildMode mode in BuildMode.values) {
when(mockArtifacts.getArtifactPath(Artifact.snapshotDart,
platform: anyNamed('platform'), mode: mode)).thenReturn(kSnapshotDart);
}
}); });
final Map<Type, Generator> contextOverrides = <Type, Generator>{ final Map<Type, Generator> contextOverrides = <Type, Generator>{
......
...@@ -37,7 +37,7 @@ void main() { ...@@ -37,7 +37,7 @@ void main() {
equals('Flutter.framework not found at ios_profile/Flutter.framework'), equals('Flutter.framework not found at ios_profile/Flutter.framework'),
); );
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -66,7 +66,7 @@ void main() { ...@@ -66,7 +66,7 @@ void main() {
'Expected a string like "Apple (LLVM|clang) #.#.# (clang-####.#.##.#)".'), 'Expected a string like "Apple (LLVM|clang) #.#.# (clang-####.#.##.#)".'),
); );
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -94,7 +94,7 @@ void main() { ...@@ -94,7 +94,7 @@ void main() {
await validateBitcode(BuildMode.profile, TargetPlatform.ios); await validateBitcode(BuildMode.profile, TargetPlatform.ios);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -121,7 +121,7 @@ void main() { ...@@ -121,7 +121,7 @@ void main() {
await validateBitcode(BuildMode.profile, TargetPlatform.ios); await validateBitcode(BuildMode.profile, TargetPlatform.ios);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -154,7 +154,7 @@ void main() { ...@@ -154,7 +154,7 @@ void main() {
'of Xcode to at least 10.0.1.'), 'of Xcode to at least 10.0.1.'),
); );
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -183,7 +183,7 @@ void main() { ...@@ -183,7 +183,7 @@ void main() {
expect(testLogger.statusText, ''); expect(testLogger.statusText, '');
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
...@@ -212,7 +212,7 @@ void main() { ...@@ -212,7 +212,7 @@ void main() {
expect(testLogger.statusText, ''); expect(testLogger.statusText, '');
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Artifacts: () => LocalEngineArtifacts('/engine', 'ios_profile', 'host_profile', Artifacts: () => LocalEngineArtifacts('ios_profile', 'host_profile',
fileSystem: memoryFileSystem, fileSystem: memoryFileSystem,
cache: globals.cache, cache: globals.cache,
platform: globals.platform, platform: globals.platform,
......
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