[Android] Add an action to check/record attached devices

build/android/gyp/push_libraries.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.
 
 """Pushes native libraries to a device.
 
 """
 
 import json
 import optparse
 import os
 import sys
 
+from util import build_device
 from util import build_utils
 from util import md5_check
 
-BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
-sys.path.append(BUILD_ANDROID_DIR)
-
-from pylib import android_commands
-
-
 def DoPush(options):
   libraries = build_utils.ReadJson(options.libraries_json)
 
-  adb = android_commands.AndroidCommands()
-  serial_number = adb.Adb().GetSerialNumber()
+  bd = build_device.GetBuildDeviceFromPath(options.build_device_configuration)
+  if not bd:
+    return
+
+  serial_number = bd.GetSerialNumber()
   # A list so that it is modifiable in Push below.
   needs_directory = [True]
   for lib in libraries:
     device_path = os.path.join(options.device_dir, lib)
     host_path = os.path.join(options.libraries_dir, lib)
 
     def Push():
       if needs_directory:
-        adb.RunShellCommand('mkdir -p ' + options.device_dir)
+        bd.RunShellCommand('mkdir -p ' + options.device_dir)
         needs_directory[:] = [] # = False
-      adb.PushIfNeeded(host_path, device_path)
+      bd.PushIfNeeded(host_path, device_path)
 
     record_path = '%s.%s.push.md5.stamp' % (host_path, serial_number)
     md5_check.CallAndRecordIfStale(
         Push,
         record_path=record_path,
         input_paths=[host_path],
         input_strings=[device_path])
 
 
 def main(argv):
-  if not build_utils.IsDeviceReady():
-    build_utils.PrintBigWarning(
-        'Zero (or multiple) devices attached. Skipping native library push.')
-    return
-
   parser = optparse.OptionParser()
   parser.add_option('--libraries-dir',
       help='Directory that contains stripped libraries.')
   parser.add_option('--device-dir',
       help='Device directory to push the libraries to.')
   parser.add_option('--libraries-json',
       help='Path to the json list of native libraries.')
   parser.add_option('--stamp', help='Path to touch on success.')
+  parser.add_option('--build-device-configuration',
+      help='Path to build device configuration.')
   options, _ = parser.parse_args()
 
   required_options = ['libraries_dir', 'device_dir', 'libraries_json']
   build_utils.CheckOptions(options, parser, required=required_options)
 
   DoPush(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))