Refactor adb_*_command_line helpers bash->python

build/android/adb_command_line.py

Index: build/android/adb_command_line.py
diff --git a/build/android/adb_command_line.py b/build/android/adb_command_line.py
new file mode 100755
index 0000000000000000000000000000000000000000..af6b2e6d0b3dbd9d57d52bbad11865a94a2827c5
--- /dev/null
+++ b/build/android/adb_command_line.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+# Copyright 2015 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.
+
+"""Utility for reading / writing command-line flag files on device(s)."""
+
+import argparse
+import sys
+
+from devil.android import device_utils
+from devil.android import device_errors
+from devil.utils import cmd_helper
+
+
+def main():
+  parser = argparse.ArgumentParser(description=__doc__)
+  parser.usage = '''%(prog)s --device-path PATH [--device SERIAL] [flags...]
+
+No flags: Prints existing command-line file.
+Empty string: Deletes command-line file.
+Otherwise: Writes command-line file.
+
+'''
+  parser.add_argument('-d', '--device', dest='device',
+                      help='Target device for apk to install on.')
+  parser.add_argument('--device-path', required=True,
+                      help='Remote path to flags file.')
+  args, remote_args = parser.parse_known_args()
+
+  as_root = not args.device_path.startswith('/data/local/tmp/')
+
+  if args.device:
+    devices = [device_utils.DeviceUtils(args.device, default_retries=0)]
+  else:
+    devices = device_utils.DeviceUtils.HealthyDevices(default_retries=0)
+    if not devices:
+      raise device_errors.NoDevicesError()
+
+  all_devices = device_utils.DeviceUtils.parallel(devices)
+
+  def print_args():
+    def read_flags(device):
+      try:
+        return device.ReadFile(args.device_path, as_root=as_root)
+      except device_errors.AdbCommandFailedError:
+        return '\n'  # File might not exist.
+
+    descriptions = all_devices.pMap(lambda d: d.build_description).pGet(None)
+    flags = all_devices.pMap(read_flags).pGet(None)
+    for d, desc, flags in zip(devices, descriptions, flags):
+      print '  %s (%s): %s' % (d, desc, flags),
+
+  # No args == print flags.
+  if not remote_args:
+    print 'Existing flags (in %s):' % args.device_path
+    print_args()
+    return 0
+
+  # Empty string arg == delete flags file.
+  if len(remote_args) == 1 and not remote_args[0]:
+    def delete_flags(device):
+      device.RunShellCommand(['rm', '-f', args.device_path], as_root=as_root)
+    all_devices.pMap(delete_flags).pGet(None)
+    print 'Deleted %s' % args.device_path
+    return 0
+
+  # Set flags.
+  quoted_args = ' '.join(cmd_helper.SingleQuote(x) for x in remote_args)
+  flags_str = 'chrome %s' % quoted_args
+
+  def write_flags(device):
+    device.WriteFile(args.device_path, flags_str, as_root=as_root)
+    device.RunShellCommand(['chmod', '0664', args.device_path], as_root=as_root)
+
+  all_devices.pMap(write_flags).pGet(None)
+  print 'Wrote flags to %s' % args.device_path
+  print_args()
+

[jbudorick, 2015/11/23 20:02:10]

nit: return 0 at the end

[agrieve, 2015/11/23 20:42:47]

Done.

+
+if __name__ == '__main__':
+  sys.exit(main())