Index: build/android/pylib/__init__.py |
diff --git a/build/android/pylib/__init__.py b/build/android/pylib/__init__.py |
index 727e987e6b621957ed56f20af1968525a9abadcf..ba6323e985981379c71c2e90295ea96e0f4c18c1 100644 |
--- a/build/android/pylib/__init__.py |
+++ b/build/android/pylib/__init__.py |
@@ -2,3 +2,18 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+import os |
+import subprocess |
+ |
+ |
+if not os.environ.get('ANDROID_SDK_ROOT'): |
+ # If envsetup.sh hasn't been sourced and there's no adb in the path, |
+ # set it here. |
+ with file(os.devnull, 'w') as devnull: |
+ ret = subprocess.call(['which', 'adb'], stdout=devnull, stderr=devnull) |
+ if ret: |
+ print 'No adb found in $PATH, fallback to checked in binary.' |
+ os.environ['PATH'] += os.pathsep + os.path.abspath(os.path.join( |
+ os.path.dirname(__file__), |
+ '..', '..', '..', |
+ 'third_party', 'android_tools', 'sdk', 'platform-tools')) |