Android: allows using adb from a chromium checkout without envsetup.sh

build/android/pylib/__init__.py

Index: build/android/pylib/__init__.py
diff --git a/build/android/pylib/__init__.py b/build/android/pylib/__init__.py
index c68adccbd36d9a6f1ebed3140163ab24e2522e00..96196cffb2720d69ac46a41dd9bb9f4005bcfa9e 100644
--- a/build/android/pylib/__init__.py
+++ b/build/android/pylib/__init__.py
@@ -1,21 +1,3 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
-import os
-import subprocess
-import sys
-
-
-if sys.platform == 'linux2' and 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.
-  try:
-    with file(os.devnull, 'w') as devnull:
-      subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
-  except OSError:
-      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'))