DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1108 from sgraham/android-home

Browse Source 
Look in $ANDROID_HOME/platform-tools/adb too
This commit is contained in:
Scott Graham 2015-09-10 11:00:51 -07:00
commit c1262abc03
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/sky_tool
View File

@ -313,7 +313,15 @@ class AndroidDevice(object):
return
if 'ANDROID_HOME' in os.environ:
android_home_dir = os.environ['ANDROID_HOME']
self.adb_path = os.path.join(android_home_dir, 'sdk', 'platform-tools', 'adb')
adb_location1 = os.path.join(android_home_dir, 'sdk', 'platform-tools', 'adb')
adb_location2 = os.path.join(android_home_dir, 'platform-tools', 'adb')
if os.path.exists(adb_location1):
self.adb_path = adb_location1
elif os.path.exists(adb_location2):
self.adb_path = adb_location2
else:
logging.warning('"adb" not found at\n "%s" or\n "%s"\nusing default path "%s"' % (adb_location1, adb_location2, ADB_PATH))
self.adb_path = ADB_PATH
else:
self.adb_path = ADB_PATH