diff --git a/packages/flutter_tools/lib/src/bundle.dart b/packages/flutter_tools/lib/src/bundle.dart index 83153e2065a..45f6b758a5b 100644 --- a/packages/flutter_tools/lib/src/bundle.dart +++ b/packages/flutter_tools/lib/src/bundle.dart @@ -82,8 +82,6 @@ class BundleBuilder { String applicationKernelFilePath, String depfilePath, String assetDirPath, - bool precompiledSnapshot = false, - bool reportLicensedPackages = false, bool trackWidgetCreation = false, List extraFrontEndOptions = const [], List extraGenSnapshotOptions = const [], @@ -102,7 +100,6 @@ class BundleBuilder { flutterProject: flutterProject, outputDir: assetDirPath, depfilePath: depfilePath, - precompiled: precompiledSnapshot, trackWidgetCreation: trackWidgetCreation, treeShakeIcons: treeShakeIcons, dartDefines: buildInfo.dartDefines, @@ -128,13 +125,11 @@ Future buildWithAssemble({ @required String mainPath, @required String outputDir, @required String depfilePath, - @required bool precompiled, bool trackWidgetCreation, @required bool treeShakeIcons, List dartDefines, }) async { // If the precompiled flag was not passed, force us into debug mode. - buildMode = precompiled ? buildMode : BuildMode.debug; final Environment environment = Environment( projectDir: flutterProject.directory, outputDir: globals.fs.directory(outputDir), diff --git a/packages/flutter_tools/lib/src/commands/build_bundle.dart b/packages/flutter_tools/lib/src/commands/build_bundle.dart index ef4d8fbf242..bc6c15f12fe 100644 --- a/packages/flutter_tools/lib/src/commands/build_bundle.dart +++ b/packages/flutter_tools/lib/src/commands/build_bundle.dart @@ -18,22 +18,9 @@ class BuildBundleCommand extends BuildSubCommand { usesTargetOption(); usesFilesystemOptions(hide: !verboseHelp); usesBuildNumberOption(); - addBuildModeFlags(verboseHelp: verboseHelp); + addBuildModeFlags(verboseHelp: verboseHelp, defaultToRelease: false); usesExtraDartFlagOptions(); argParser - ..addFlag( - 'precompiled', - negatable: false, - help: - 'If not provided, then ' - 'a debug build is always provided, regardless of build mode. If provided ' - 'then release is the default mode.', - ) - // This option is still referenced by the iOS build scripts. We should - // remove it once we've updated those build scripts. - ..addOption('asset-base', help: 'Ignored. Will be removed.', hide: !verboseHelp) - ..addOption('manifest', defaultsTo: defaultManifestPath) - ..addOption('private-key', defaultsTo: defaultPrivateKeyPath) ..addOption('depfile', defaultsTo: defaultDepfilePath) ..addOption('target-platform', defaultsTo: 'android-arm', @@ -48,11 +35,7 @@ class BuildBundleCommand extends BuildSubCommand { 'windows-x64', ], ) - ..addOption('asset-dir', defaultsTo: getAssetBuildDirectory()) - ..addFlag('report-licensed-packages', - help: 'Whether to report the names of all the packages that are included ' - "in the application's LICENSE file.", - defaultsTo: false); + ..addOption('asset-dir', defaultsTo: getAssetBuildDirectory()); usesPubOption(); usesTrackWidgetCreation(verboseHelp: verboseHelp); @@ -119,11 +102,9 @@ class BuildBundleCommand extends BuildSubCommand { platform: platform, buildInfo: buildInfo, mainPath: targetFile, - manifestPath: stringArg('manifest'), + manifestPath: defaultManifestPath, depfilePath: stringArg('depfile'), assetDirPath: stringArg('asset-dir'), - precompiledSnapshot: boolArg('precompiled'), - reportLicensedPackages: boolArg('report-licensed-packages'), trackWidgetCreation: boolArg('track-widget-creation'), extraFrontEndOptions: buildInfo.extraFrontEndOptions, extraGenSnapshotOptions: buildInfo.extraGenSnapshotOptions, diff --git a/packages/flutter_tools/lib/src/tester/flutter_tester.dart b/packages/flutter_tools/lib/src/tester/flutter_tester.dart index 974d4c11012..6f138bfb319 100644 --- a/packages/flutter_tools/lib/src/tester/flutter_tester.dart +++ b/packages/flutter_tools/lib/src/tester/flutter_tester.dart @@ -158,9 +158,7 @@ class FlutterTesterDevice extends Device { await BundleBuilder().build( buildInfo: buildInfo, mainPath: mainPath, - assetDirPath: assetDirPath, applicationKernelFilePath: applicationKernelFilePath, - precompiledSnapshot: false, trackWidgetCreation: buildInfo.trackWidgetCreation, platform: getTargetPlatformForName(getNameForHostPlatform(getCurrentHostPlatform())), treeShakeIcons: buildInfo.treeShakeIcons, diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart index c307699369d..ca0cc305ace 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart @@ -39,8 +39,6 @@ void main() { applicationKernelFilePath: anyNamed('applicationKernelFilePath'), depfilePath: anyNamed('depfilePath'), assetDirPath: anyNamed('assetDirPath'), - precompiledSnapshot: anyNamed('precompiledSnapshot'), - reportLicensedPackages: anyNamed('reportLicensedPackages'), trackWidgetCreation: anyNamed('trackWidgetCreation'), extraFrontEndOptions: anyNamed('extraFrontEndOptions'), extraGenSnapshotOptions: anyNamed('extraGenSnapshotOptions'), diff --git a/packages/flutter_tools/test/general.shard/bundle_shim_test.dart b/packages/flutter_tools/test/general.shard/bundle_shim_test.dart index ae7a302d0fb..e8634c92a32 100644 --- a/packages/flutter_tools/test/general.shard/bundle_shim_test.dart +++ b/packages/flutter_tools/test/general.shard/bundle_shim_test.dart @@ -38,7 +38,6 @@ void main() { outputDir: 'example', targetPlatform: TargetPlatform.ios, depfilePath: 'example.d', - precompiled: false, treeShakeIcons: false, ); expect(globals.fs.file(globals.fs.path.join('example', 'kernel_blob.bin')).existsSync(), true); @@ -61,7 +60,6 @@ void main() { outputDir: 'example', targetPlatform: TargetPlatform.linux_x64, depfilePath: 'example.d', - precompiled: false, treeShakeIcons: false, ), throwsToolExit()); }));