summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authorjbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 21:12:03 +0000
committerjbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 21:12:03 +0000
commitac962032d7446017841462a2e612bbed1fe1af36 (patch)
tree0d4418b73f2517f8920d0130a05b181d29a7583d /build/android
parent72bce5264bdb62d32d684f1e9c639bb2932e695c (diff)
downloadchromium_src-ac962032d7446017841462a2e612bbed1fe1af36.zip
chromium_src-ac962032d7446017841462a2e612bbed1fe1af36.tar.gz
chromium_src-ac962032d7446017841462a2e612bbed1fe1af36.tar.bz2
I broke something by removing an apparently unused import that actually was used elsewhere. I addressed the issue by having the client code just call android_commands.GetAttachedDevices explicitly.
BUG=168518 Review URL: https://codereview.chromium.org/143623007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rw-r--r--build/android/PRESUBMIT.py2
-rw-r--r--build/android/gyp/util/build_device.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py
index 85a1eda..0e12726 100644
--- a/build/android/PRESUBMIT.py
+++ b/build/android/PRESUBMIT.py
@@ -35,8 +35,6 @@ def CommonChecks(input_api, output_api):
"""Returns a path relative to presubmit directory."""
return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs)
- # F0401 is issued when pylint can't import a module, but it doesn't seem to
- # work correctly on our scripts.
output.extend(input_api.canned_checks.RunPylint(
input_api,
output_api,
diff --git a/build/android/gyp/util/build_device.py b/build/android/gyp/util/build_device.py
index 03d5f2a..07e35b2 100644
--- a/build/android/gyp/util/build_device.py
+++ b/build/android/gyp/util/build_device.py
@@ -17,6 +17,8 @@ BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..')
sys.path.append(BUILD_ANDROID_DIR)
from pylib import android_commands
+# While this isn't used in this file, it is used in some files that import it.
+from pylib.android_commands import GetAttachedDevices # pylint: disable=W0611
class BuildDevice(object):