[Android] Add workaround to update verification script for Mac.

build/android/update_verification.py

Index: build/android/update_verification.py
diff --git a/build/android/update_verification.py b/build/android/update_verification.py
index dada794d0238ec496a4239b880f249e98a5e6784..817e75e46415386156e8ef7e133ce24e3c1859f1 100755
--- a/build/android/update_verification.py
+++ b/build/android/update_verification.py
@@ -35,22 +35,19 @@ from pylib.device import device_utils
 from pylib.utils import apk_helper
 from pylib.utils import run_tests_helper
 
-def CreateAppData(device, old_apk, app_data):
+def CreateAppData(device, old_apk, app_data, package_name):
   device.Install(old_apk)
   raw_input('Set the application state. Once ready, press enter and '
             'select "Backup my data" on the device.')
-  package_name = apk_helper.GetPackageName(old_apk)
   device.adb.Backup(app_data, packages=[package_name])
   logging.critical('Application data saved to %s' % app_data)
 
-def TestUpdate(device, old_apk, new_apk, app_data):
+def TestUpdate(device, old_apk, new_apk, app_data, package_name):
   device.Install(old_apk)
   device.adb.Restore(app_data)
   # Restore command is not synchronous
   raw_input('Select "Restore my data" on the device. Then press enter to '
             'continue.')
-
-  package_name = apk_helper.GetPackageName(new_apk)
   device_path = device.GetApplicationPath(package_name)
   if not device_path:
     raise Exception('Expected package %s to already be installed. '
@@ -70,18 +67,22 @@ def main():
 
   subparser = command_parsers.add_parser('create_app_data')
   subparser.add_argument('--old-apk', required=True,
-                      help='Path to apk to update from.')
+                         help='Path to apk to update from.')
   subparser.add_argument('--app-data', required=True,
-                      help='Path to where the app data backup should be '
+                         help='Path to where the app data backup should be '
                            'saved to.')
+  subparser.add_argument('--package-name',
+                         help='Chrome apk package name.')
 
   subparser = command_parsers.add_parser('test_update')
   subparser.add_argument('--old-apk', required=True,
-                      help='Path to apk to update from.')
+                         help='Path to apk to update from.')
   subparser.add_argument('--new-apk', required=True,
-                      help='Path to apk to update to.')
+                         help='Path to apk to update to.')
   subparser.add_argument('--app-data', required=True,
-                      help='Path to where the app data backup is saved.')
+                         help='Path to where the app data backup is saved.')
+  subparser.add_argument('--package-name',
+                         help='Chrome apk package name.')
 
   args = parser.parse_args()
   run_tests_helper.SetLogLevel(args.verbose)
@@ -91,9 +92,14 @@ def main():
   logging.info('Using device %s for testing.' % str(device))
 
   if args.command == 'create_app_data':
-    CreateAppData(device, args.old_apk, args.app_data)
+    package_name = (args.package_name if args.package_name

[jbudorick, 2015/05/22 23:23:31]

nit: do this outside of the if/elif

[mikecase (-- gone --), 2015/05/22 23:58:48]

Done.  Also, fyi, added a change in my latest patch to raise an exception if no
devices are found.

+                    else apk_helper.GetPackageName(args.old_apk))
+    CreateAppData(device, args.old_apk, args.app_data, package_name)
   elif args.command == 'test_update':
-    TestUpdate(device,  args.old_apk, args.new_apk, args.app_data)
+    package_name = (args.package_name if args.package_name
+                    else apk_helper.GetPackageName(args.new_apk))
+    TestUpdate(
+        device, args.old_apk, args.new_apk, args.app_data, package_name)
   else:
     raise Exception('Unknown test command: %s' % args.command)