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 109 matching lines @@
   After wiping data on a device that has been authorized, adb can still
   communicate with the device, but after reboot the device will need to be
   re-authorized because the adb keys file is stored in /data/misc/adb/.
   Thus, adb_keys file is rewritten so the device does not need to be
   re-authorized.
 
   Arguments:
     device: the device to wipe
   """
   device_authorized = device.FileExists(constants.ADB_KEYS_FILE)
+  adb_public_key = ''
+  with open(constants.ADB_PUBLIC_KEY, 'r') as f:
+    adb_public_key = f.readlines()
   if device_authorized:
     adb_keys = device.ReadFile(constants.ADB_KEYS_FILE, as_root=True)
   device.RunShellCommand('wipe data', as_root=True)
   if device_authorized:
     path_list = constants.ADB_KEYS_FILE.split('/')
     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)
+    if 'chrome-infrastructure-adb-key' not in adb_keys:
+      adb_keys += ''.join(adb_public_key)
     device.WriteFile(constants.ADB_KEYS_FILE, adb_keys, as_root=True)
     device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                            as_root=True)
-
+  else:
+    device.WriteFile(constants.ADB_KEYS_FILE, adb_public_key, as_root=True)
 
 def WipeDeviceIfPossible(device, timeout):
   try:
     device.EnableRoot()
     WipeDeviceData(device)
     device.Reboot(True, timeout=timeout, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
 
@@ skipping 125 matching lines @@
                       help='push binary which will reboot the device on adb'
                       ' disconnections')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())