diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index 1f85fd031f..06728cb71f 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -308,7 +308,7 @@ class AOTSnapshotter { sdkRoot: artifacts.getArtifactPath(Artifact.flutterPatchedSdkPath), mainPath: mainPath, outputFilePath: fs.path.join(outputPath, 'app.dill'), - depFilePath: depfilePath, + depfilePath: depfilePath, extraFrontEndOptions: extraFrontEndOptions, linkPlatformKernelIn: true, aot: true, diff --git a/packages/flutter_tools/lib/src/bundle.dart b/packages/flutter_tools/lib/src/bundle.dart index db1b56945e..2a1a529698 100644 --- a/packages/flutter_tools/lib/src/bundle.dart +++ b/packages/flutter_tools/lib/src/bundle.dart @@ -35,9 +35,7 @@ Future build({ BuildMode buildMode, String mainPath = defaultMainPath, String manifestPath = defaultManifestPath, - String snapshotPath, String applicationKernelFilePath, - String depfilePath, String privateKeyPath = defaultPrivateKeyPath, String assetDirPath, String packagesPath, @@ -51,8 +49,6 @@ Future build({ List fileSystemRoots, String fileSystemScheme, }) async { - snapshotPath ??= defaultSnapshotPath; - depfilePath ??= defaultDepfilePath; assetDirPath ??= getAssetBuildDirectory(); packagesPath ??= fs.path.absolute(PackageMap.globalPackagesPath); applicationKernelFilePath ??= defaultApplicationKernelPath; @@ -68,7 +64,7 @@ Future build({ fs.path.absolute(getIncrementalCompilerByteStoreDirectory()), mainPath: fs.file(mainPath).absolute.path, outputFilePath: applicationKernelFilePath, - depFilePath: depfilePath, + depfilePath: defaultDepfilePath, trackWidgetCreation: trackWidgetCreation, extraFrontEndOptions: extraFrontEndOptions, fileSystemRoots: fileSystemRoots, diff --git a/packages/flutter_tools/lib/src/commands/build_bundle.dart b/packages/flutter_tools/lib/src/commands/build_bundle.dart index c46d6b5600..3a4d6b62b9 100644 --- a/packages/flutter_tools/lib/src/commands/build_bundle.dart +++ b/packages/flutter_tools/lib/src/commands/build_bundle.dart @@ -22,8 +22,6 @@ class BuildBundleCommand extends BuildSubCommand { ..addOption('asset-base', help: 'Ignored. Will be removed.', hide: !verboseHelp) ..addOption('manifest', defaultsTo: defaultManifestPath) ..addOption('private-key', defaultsTo: defaultPrivateKeyPath) - ..addOption('snapshot', defaultsTo: defaultSnapshotPath) - ..addOption('depfile', defaultsTo: defaultDepfilePath) ..addOption('kernel-file', defaultsTo: defaultApplicationKernelPath) ..addOption('target-platform', defaultsTo: 'android-arm', @@ -93,9 +91,7 @@ class BuildBundleCommand extends BuildSubCommand { buildMode: buildMode, mainPath: targetFile, manifestPath: argResults['manifest'], - snapshotPath: argResults['snapshot'], applicationKernelFilePath: argResults['kernel-file'], - depfilePath: argResults['depfile'], privateKeyPath: argResults['private-key'], assetDirPath: argResults['asset-dir'], precompiledSnapshot: argResults['precompiled'], diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index c2b0352b03..e5938cb9a1 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -81,7 +81,7 @@ class KernelCompiler { String sdkRoot, String mainPath, String outputFilePath, - String depFilePath, + String depfilePath, bool linkPlatformKernelIn = false, bool aot = false, bool trackWidgetCreation = false, @@ -100,16 +100,16 @@ class KernelCompiler { // Currently the compiler emits buildbot paths for the core libs in the // depfile. None of these are available on the local host. Fingerprinter fingerprinter; - if (depFilePath != null) { + if (depfilePath != null) { fingerprinter = Fingerprinter( - fingerprintPath: '$depFilePath.fingerprint', + fingerprintPath: '$depfilePath.fingerprint', paths: [mainPath], properties: { 'entryPoint': mainPath, 'trackWidgetCreation': trackWidgetCreation.toString(), 'linkPlatformKernelIn': linkPlatformKernelIn.toString(), }, - depfilePaths: [depFilePath], + depfilePaths: [depfilePath], pathFilter: (String path) => !path.startsWith('/b/build/slave/'), ); @@ -154,8 +154,8 @@ class KernelCompiler { if (outputFilePath != null) { command.addAll(['--output-dill', outputFilePath]); } - if (depFilePath != null && (fileSystemRoots == null || fileSystemRoots.isEmpty)) { - command.addAll(['--depfile', depFilePath]); + if (depfilePath != null && (fileSystemRoots == null || fileSystemRoots.isEmpty)) { + command.addAll(['--depfile', depfilePath]); } if (fileSystemRoots != null) { for (String root in fileSystemRoots) { diff --git a/packages/flutter_tools/test/tester/flutter_tester_test.dart b/packages/flutter_tools/test/tester/flutter_tester_test.dart index 5b7aa26d8c..33222da487 100644 --- a/packages/flutter_tools/test/tester/flutter_tester_test.dart +++ b/packages/flutter_tools/test/tester/flutter_tester_test.dart @@ -169,7 +169,7 @@ Hello! incrementalCompilerByteStorePath: anyNamed('incrementalCompilerByteStorePath'), mainPath: anyNamed('mainPath'), outputFilePath: anyNamed('outputFilePath'), - depFilePath: anyNamed('depFilePath'), + depfilePath: anyNamed('depfilePath'), trackWidgetCreation: anyNamed('trackWidgetCreation'), extraFrontEndOptions: anyNamed('extraFrontEndOptions'), fileSystemRoots: anyNamed('fileSystemRoots'),