From 405eda02f8f6b95089d6e063a8611977310653d9 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Wed, 9 Sep 2015 15:03:01 -0700 Subject: [PATCH] Look in ANDROID_HOME/platform-tools/adb for adb too --- sky/packages/sky/lib/sky_tool | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sky/packages/sky/lib/sky_tool b/sky/packages/sky/lib/sky_tool index 1d5976ebc1f..d157b218dcf 100755 --- a/sky/packages/sky/lib/sky_tool +++ b/sky/packages/sky/lib/sky_tool @@ -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