diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 1df0b0dbaf..2e1bf5e781 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -312,7 +312,7 @@ class AndroidDevice extends Device { if (!prebuiltApplication) { printTrace('Building APK'); - await buildApk(targetPlatform, + await buildApk( target: mainPath, buildMode: debuggingOptions.buildMode, kernelPath: kernelPath, diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart index c2834722ed..0a8bb831f9 100644 --- a/packages/flutter_tools/lib/src/commands/build_apk.dart +++ b/packages/flutter_tools/lib/src/commands/build_apk.dart @@ -31,11 +31,6 @@ class BuildApkCommand extends BuildSubCommand { usesTargetOption(); addBuildModeFlags(); usesPubOption(); - - argParser.addOption('target-arch', - defaultsTo: 'arm', - allowed: ['arm', 'x86', 'x64'], - help: 'Architecture of the target device.'); } @override @@ -47,31 +42,16 @@ class BuildApkCommand extends BuildSubCommand { 'debugging and a quick development cycle. \'release\' builds don\'t support debugging and are\n' 'suitable for deploying to app stores.'; - TargetPlatform _getTargetPlatform(String targetArch) { - switch (targetArch) { - case 'arm': - return TargetPlatform.android_arm; - case 'x86': - return TargetPlatform.android_x86; - case 'x64': - return TargetPlatform.android_x64; - default: - throw new Exception('Unrecognized target architecture: $targetArch'); - } - } - @override Future runCommand() async { await super.runCommand(); - final TargetPlatform targetPlatform = _getTargetPlatform(argResults['target-arch']); final BuildMode buildMode = getBuildMode(); - await buildApk(targetPlatform, buildMode: buildMode, target: targetFile); + await buildApk(buildMode: buildMode, target: targetFile); } } -Future buildApk( - TargetPlatform platform, { +Future buildApk({ String target, BuildMode buildMode: BuildMode.debug, String kernelPath, @@ -85,9 +65,6 @@ Future buildApk( ); } - if (platform != TargetPlatform.android_arm && buildMode != BuildMode.debug) { - throwToolExit('Profile and release builds are only supported on ARM targets.'); - } // Validate that we can find an android sdk. if (androidSdk == null) throwToolExit('No Android SDK found. Try setting the ANDROID_HOME environment variable.');