Write adb public key to devices during provision.

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 140 matching lines @@
 
 def ProvisionDevice(device, options):
   if options.reboot_timeout:
     reboot_timeout = options.reboot_timeout
   elif (device.build_version_sdk >=
         constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
     reboot_timeout = _DEFAULT_TIMEOUTS.LOLLIPOP
   else:
     reboot_timeout = _DEFAULT_TIMEOUTS.PRE_LOLLIPOP
 
+  if options.adb_key_files:
+    adb_keys = set()
+    for adb_key_file in options.adb_key_files:
+      file_path = os.path.join(os.environ['HOME'], '.android', adb_key_file)

[jbudorick, 2015/02/25 01:32:46]

to be clear: I don't think this should be locked into ~/.android. I think the
caller should pass the path, not just the file name.

[navabi, 2015/02/25 01:37:21]

Yep. This is a mistake. options.adb_key_files will be the files that are passed
in as arguments (e.g. ~/.android/adbkeys.pub).

+      with open(file_path, 'r') as f:
+        adb_public_key = f.readlines()[0]
+      adb_keys.add(adb_public_key)
+    path_list = constants.ADB_KEYS_FILE.split('/')

[jbudorick, 2015/02/25 01:32:46]

Why is this now just duplicating the logic from WipeDeviceData?

[navabi, 2015/02/25 01:37:21]

The only part that is duplicated, is the part that writes to the file. It will
write a different set of adb keys to the file.

I'll move the write to /data/misc/adb/adb_keys to a different function.

+    dir_path = '/'.join(path_list[:len(path_list)-1])
+    device.RunShellCommand('mkdir -p %s' % dir_path, as_root=True)
+    device.RunShellCommand('restorecon %s' % dir_path, as_root=True)
+    adb_key_contents = '\n'.join(adb_keys)
+    device.WriteFile(constants.ADB_KEYS_FILE, adb_key_contents, as_root=True)
+    device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
+                           as_root=True)
+
   try:
     if not options.skip_wipe:
       WipeDeviceIfPossible(device, reboot_timeout)
     try:
       device.EnableRoot()
     except device_errors.CommandFailedError as e:
       logging.warning(str(e))
     _ConfigureLocalProperties(device, options.enable_java_debug)
     device_settings.ConfigureContentSettings(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
@@ skipping 98 matching lines @@
   parser.add_argument('--disable-network', action='store_true',
                       help='disable network access on devices')
   parser.add_argument('--disable-java-debug', action='store_false',
                       dest='enable_java_debug', default=True,
                       help='disable Java property asserts and JNI checking')
   parser.add_argument('-t', '--target', default='Debug',
                       help='the build target (default: %(default)s)')
   parser.add_argument('-r', '--auto-reconnect', action='store_true',
                       help='push binary which will reboot the device on adb'
                       ' disconnections')
+  parser.add_argument('--adb-key-files', type=str, nargs='+',
+                      help='list of adb keys to push to device')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())