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

Prefer getAdbPath(androidSdk) over androidSdk.adbPath (#4076)

Browse Source 
For developers with the platform tools installed but no SDK, it prevents
crashing in the flutter tool in favor of more user-friendly error messages
downstream.
This commit is contained in:
Todd Volkert 2016-05-20 10:45:35 -07:00
parent 719add8171
commit 3042da9f6d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import '../globals.dart';
import '../protocol_discovery.dart'; import '../protocol_discovery.dart';
import 'adb.dart'; import 'adb.dart';
import 'android.dart'; import 'android.dart';
import 'android_sdk.dart';
const String _defaultAdbPath = 'adb'; const String _defaultAdbPath = 'adb';
@ -104,7 +105,7 @@ class AndroidDevice extends Device {
_AndroidDevicePortForwarder _portForwarder; _AndroidDevicePortForwarder _portForwarder;
List<String> adbCommandForDevice(List<String> args) { List<String> adbCommandForDevice(List<String> args) {
return <String>[androidSdk.adbPath, '-s', id]..addAll(args); return <String>[getAdbPath(androidSdk), '-s', id]..addAll(args);
} }
bool _isValidAdbVersion(String adbVersion) { bool _isValidAdbVersion(String adbVersion) {
@ -135,10 +136,10 @@ class AndroidDevice extends Device {
return false; return false;
try { try {
String adbVersion = runCheckedSync(<String>[androidSdk.adbPath, 'version']); String adbVersion = runCheckedSync(<String>[getAdbPath(androidSdk), 'version']);
if (_isValidAdbVersion(adbVersion)) if (_isValidAdbVersion(adbVersion))
return true; return true;
printError('The ADB at "${androidSdk.adbPath}" is too old; please install version 1.0.32 or later.'); printError('The ADB at "${getAdbPath(androidSdk)}" is too old; please install version 1.0.32 or later.');
} catch (error, trace) { } catch (error, trace) {
printError('Error running ADB: $error', trace); printError('Error running ADB: $error', trace);
} }
@ -152,7 +153,7 @@ class AndroidDevice extends Device {
// output lines like this, which we want to ignore: // output lines like this, which we want to ignore:
// adb server is out of date. killing.. // adb server is out of date. killing..
// * daemon started successfully * // * daemon started successfully *
runCheckedSync(<String>[androidSdk.adbPath, 'start-server']); runCheckedSync(<String>[getAdbPath(androidSdk), 'start-server']);
// Sample output: '22' // Sample output: '22'
String sdkVersion = _getProperty('ro.build.version.sdk'); String sdkVersion = _getProperty('ro.build.version.sdk');

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

@ -29,6 +29,9 @@ const Map<String, int> _namedVersionMap = const <String, int> {
}; };
/// Locate ADB. Prefer to use one from an Android SDK, if we can locate that. /// Locate ADB. Prefer to use one from an Android SDK, if we can locate that.
/// This should be used over accessing androidSdk.adbPath directly because it
/// will work for those users who have Android Platform Tools installed but
/// not the full SDK.
String getAdbPath([AndroidSdk existingSdk]) { String getAdbPath([AndroidSdk existingSdk]) {
if (existingSdk?.adbPath != null) if (existingSdk?.adbPath != null)
return existingSdk.adbPath; return existingSdk.adbPath;