Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1332)

Unified Diff: build/android/pylib/__init__.py

Issue 15891002: Android: allows using adb from a chromium checkout without envsetup.sh (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: which adb, devnull Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698