firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Disable selection of the Android ARM64 target platform based on the attached device" (#14650)

Browse Source 
This reverts commit cdb581807cc11030b63d00c04bb2d55fcb3d7ef4.

Dart has been updated in the engine, and this workaround should no longer be necessary.

Fixes https://github.com/flutter/flutter/issues/14646
This commit is contained in:
Jason Simmons 2018-02-12 13:56:17 -08:00 committed by GitHub
parent 2c05ecab9f
commit 09aa673b1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/android/android_device.dart
View File

@ -366,11 +366,15 @@ class AndroidDevice extends Device {
return new LaunchResult.failed(); return new LaunchResult.failed();
} }
BuildInfo buildInfo = debuggingOptions.buildInfo;
if (buildInfo.targetPlatform == null && devicePlatform == TargetPlatform.android_arm64)
buildInfo = buildInfo.withTargetPlatform(TargetPlatform.android_arm64);
if (!prebuiltApplication) { if (!prebuiltApplication) {
printTrace('Building APK'); printTrace('Building APK');
await buildApk( await buildApk(
target: mainPath, target: mainPath,
buildInfo: debuggingOptions.buildInfo, buildInfo: buildInfo,
); );
// Package has been built, so we can get the updated application ID and // Package has been built, so we can get the updated application ID and
// activity name from the .apk. // activity name from the .apk.