Fix an errant pylint change.

build/android/gyp/get_device_configuration.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Gets and writes the configurations of the attached devices.
 
 This configuration is used by later build steps to determine which devices to
 install to and what needs to be installed to those devices.
 """
 
 import optparse
+import os
 import sys
 
 # pylint: disable=F0401
 from util import build_utils
 from util import build_device
 # pylint: disable=F0401
 
+BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
+sys.path.append(BUILD_ANDROID_DIR)
+
+from pylib import android_commands

[frankf, 2014/02/10 18:35:12]

I'm guessing the original motivation here was for //build/android/gyp to only
depend on pylib through the util modules. Can we go back the way it was before
the lint CL?

[jbudorick, 2014/02/10 18:39:37]

We could, but what's the point in only visibly depending on pylib through the
util modules? As is, this is just a sort of invisible dependency, which seems to
me to be less clear.

[cjhopman, 2014/02/10 18:50:47]

Because getting the gyp dependencies correct is much more difficult when we
allow build/android/gyp to depend directly on pylib. It would be best to not
depend on pylib at all.

+
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--stamp', action='store')
   parser.add_option('--output', action='store')
   options, _ = parser.parse_args(argv)
 
-  devices = build_device.GetAttachedDevices()
+  devices = android_commands.GetAttachedDevices()
 
   device_configurations = []
   for d in devices:
     configuration, is_online, has_root = (
         build_device.GetConfigurationForDevice(d))
 
     if not is_online:
       build_utils.PrintBigWarning(
           '%s is not online. Skipping managed install for this device. '
           'Try rebooting the device to fix this warning.' % d)
@@ skipping 21 matching lines @@
         'Multiple devices attached. '
         'Installing to the preferred device: '
         '%(id)s (%(description)s)' % (device_configurations[0]))
 
 
   build_device.WriteConfigurations(device_configurations, options.output)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))