From c3ffd2a73d0ed204bbdcbb6aebb8b5e1f8e453a9 Mon Sep 17 00:00:00 2001 From: "jbudorick@chromium.org" Date: Mon, 10 Feb 2014 21:12:03 +0000 Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@250206 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/PRESUBMIT.py | 2 -- android/gyp/util/build_device.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/PRESUBMIT.py b/android/PRESUBMIT.py index 85a1eda20..0e127265a 100644 --- a/android/PRESUBMIT.py +++ b/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/android/gyp/util/build_device.py b/android/gyp/util/build_device.py index 03d5f2a27..07e35b2db 100644 --- a/android/gyp/util/build_device.py +++ b/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):