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

Replace ANDROID_HOME user messages with ANDROID_SDK_ROOT (#59867)

Browse Source
This commit is contained in:
Jenn Magder 2020-06-22 18:43:04 -07:00 committed by GitHub
parent 9470b9e2ce
commit 6a2bc2617e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/bots/test.dart
View File

@ -1113,7 +1113,7 @@ Map<String, String> _initGradleEnvironment() {
? Platform.environment['ANDROID_SDK_ROOT'] ? Platform.environment['ANDROID_SDK_ROOT']
: Platform.environment['ANDROID_HOME']; : Platform.environment['ANDROID_HOME'];
if (androidSdkRoot == null || androidSdkRoot.isEmpty) { if (androidSdkRoot == null || androidSdkRoot.isEmpty) {
print('${red}Could not find Android SDK; set ANDROID_SDK_ROOT (or ANDROID_HOME).$reset'); print('${red}Could not find Android SDK; set ANDROID_SDK_ROOT.$reset');
exit(1); exit(1);
} }
return <String, String>{ return <String, String>{

2
dev/devicelab/README.md
View File

@ -94,7 +94,7 @@ reproduce a CI test failure locally.
## Prerequisites ## Prerequisites
You must set the `ANDROID_HOME` or `ANDROID_SDK_ROOT` environment variable to run You must set `ANDROID_SDK_ROOT` environment variable to run
tests on Android. If you have a local build of the Flutter engine, then you have tests on Android. If you have a local build of the Flutter engine, then you have
a copy of the Android SDK at `.../engine/src/third_party/android_tools/sdk`. a copy of the Android SDK at `.../engine/src/third_party/android_tools/sdk`.

4
dev/devicelab/lib/framework/adb.dart
View File

@ -690,8 +690,8 @@ String get adbPath {
if (androidHome == null) { if (androidHome == null) {
throw const DeviceException( throw const DeviceException(
'The ANDROID_SDK_ROOT and ANDROID_HOME environment variables are ' 'The ANDROID_SDK_ROOT environment variable is '
'missing. At least one of these variables must point to the Android ' 'missing. The variable must point to the Android '
'SDK directory containing platform-tools.' 'SDK directory containing platform-tools.'
); );
} }

2
dev/devicelab/lib/framework/apk_utils.dart
View File

@ -105,7 +105,7 @@ String get _androidHome {
final String androidHome = Platform.environment['ANDROID_HOME'] ?? final String androidHome = Platform.environment['ANDROID_HOME'] ??
Platform.environment['ANDROID_SDK_ROOT']; Platform.environment['ANDROID_SDK_ROOT'];
if (androidHome == null || androidHome.isEmpty) { if (androidHome == null || androidHome.isEmpty) {
throw Exception('Unset env flag: `ANDROID_HOME` or `ANDROID_SDK_ROOT`.'); throw Exception('Environment variable `ANDROID_SDK_ROOT` is not set.');
} }
return androidHome; return androidHome;
} }

4
packages/flutter_tools/lib/src/android/android_device_discovery.dart
View File

@ -59,10 +59,10 @@ class AndroidDevices extends PollingDeviceDiscovery {
)).stdout.trim(); )).stdout.trim();
} on ArgumentError catch (exception) { } on ArgumentError catch (exception) {
throwToolExit('Unable to find "adb", check your Android SDK installation and ' throwToolExit('Unable to find "adb", check your Android SDK installation and '
'ANDROID_HOME environment variable: ${exception.message}'); '$kAndroidSdkRoot environment variable: ${exception.message}');
} on ProcessException catch (exception) { } on ProcessException catch (exception) {
throwToolExit('Unable to run "adb", check your Android SDK installation and ' throwToolExit('Unable to run "adb", check your Android SDK installation and '
'ANDROID_HOME environment variable: ${exception.executable}'); '$kAndroidSdkRoot environment variable: ${exception.executable}');
} }
final List<AndroidDevice> devices = <AndroidDevice>[]; final List<AndroidDevice> devices = <AndroidDevice>[];
parseADBDeviceOutput( parseADBDeviceOutput(

20
packages/flutter_tools/lib/src/android/android_sdk.dart
View File

@ -14,22 +14,24 @@ import '../convert.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import 'android_studio.dart'; import 'android_studio.dart';
// ANDROID_HOME is deprecated.
// See https://developer.android.com/studio/command-line/variables.html#envar
const String kAndroidHome = 'ANDROID_HOME'; const String kAndroidHome = 'ANDROID_HOME';
const String kAndroidSdkRoot = 'ANDROID_SDK_ROOT'; const String kAndroidSdkRoot = 'ANDROID_SDK_ROOT';
// Android SDK layout: // Android SDK layout:
// $ANDROID_HOME/platform-tools/adb // $ANDROID_SDK_ROOT/platform-tools/adb
// $ANDROID_HOME/build-tools/19.1.0/aapt, dx, zipalign // $ANDROID_SDK_ROOT/build-tools/19.1.0/aapt, dx, zipalign
// $ANDROID_HOME/build-tools/22.0.1/aapt // $ANDROID_SDK_ROOT/build-tools/22.0.1/aapt
// $ANDROID_HOME/build-tools/23.0.2/aapt // $ANDROID_SDK_ROOT/build-tools/23.0.2/aapt
// $ANDROID_HOME/build-tools/24.0.0-preview/aapt // $ANDROID_SDK_ROOT/build-tools/24.0.0-preview/aapt
// $ANDROID_HOME/build-tools/25.0.2/apksigner // $ANDROID_SDK_ROOT/build-tools/25.0.2/apksigner
// $ANDROID_HOME/platforms/android-22/android.jar // $ANDROID_SDK_ROOT/platforms/android-22/android.jar
// $ANDROID_HOME/platforms/android-23/android.jar // $ANDROID_SDK_ROOT/platforms/android-23/android.jar
// $ANDROID_HOME/platforms/android-N/android.jar // $ANDROID_SDK_ROOT/platforms/android-N/android.jar
final RegExp _numberedAndroidPlatformRe = RegExp(r'^android-([0-9]+)$'); final RegExp _numberedAndroidPlatformRe = RegExp(r'^android-([0-9]+)$');
final RegExp _sdkVersionRe = RegExp(r'^ro.build.version.sdk=([0-9]+)$'); final RegExp _sdkVersionRe = RegExp(r'^ro.build.version.sdk=([0-9]+)$');

2
packages/flutter_tools/lib/src/android/gradle_utils.dart
View File

@ -304,6 +304,6 @@ void exitWithNoSdkMessage() {
BuildEvent('unsupported-project', eventError: 'android-sdk-not-found', flutterUsage: globals.flutterUsage).send(); BuildEvent('unsupported-project', eventError: 'android-sdk-not-found', flutterUsage: globals.flutterUsage).send();
throwToolExit( throwToolExit(
'$warningMark No Android SDK found. ' '$warningMark No Android SDK found. '
'Try setting the ANDROID_HOME environment variable.' 'Try setting the ANDROID_SDK_ROOT environment variable.'
); );
} }

2
packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart
View File

@ -266,7 +266,7 @@ void main() {
arguments: <String>['--no-pub'], arguments: <String>['--no-pub'],
); );
}, throwsToolExit( }, throwsToolExit(
message: 'No Android SDK found. Try setting the ANDROID_HOME environment variable', message: 'No Android SDK found. Try setting the ANDROID_SDK_ROOT environment variable',
)); ));
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{

2
packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart
View File

@ -212,7 +212,7 @@ void main() {
arguments: <String>['--no-pub'], arguments: <String>['--no-pub'],
); );
}, throwsToolExit( }, throwsToolExit(
message: 'No Android SDK found. Try setting the ANDROID_HOME environment variable', message: 'No Android SDK found. Try setting the ANDROID_SDK_ROOT environment variable',
)); ));
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{

2
packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart
View File

@ -197,7 +197,7 @@ void main() {
arguments: <String>['--no-pub'], arguments: <String>['--no-pub'],
); );
}, throwsToolExit( }, throwsToolExit(
message: 'No Android SDK found. Try setting the ANDROID_HOME environment variable', message: 'No Android SDK found. Try setting the ANDROID_SDK_ROOT environment variable',
)); ));
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{

2
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View File

@ -323,7 +323,7 @@ void main() {
expect(() { expect(() {
updateLocalProperties(project: FlutterProject.current()); updateLocalProperties(project: FlutterProject.current());
}, throwsToolExit( }, throwsToolExit(
message: '$warningMark No Android SDK found. Try setting the ANDROID_HOME environment variable.', message: '$warningMark No Android SDK found. Try setting the ANDROID_SDK_ROOT environment variable.',
)); ));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
AndroidSdk: () => null, AndroidSdk: () => null,