Android gtest runner: Create only a single ApkHelper

build/android/incremental_install/installer.py

 #!/usr/bin/env 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.
 
 """Install *_incremental.apk targets as well as their dependent files."""
 
 import argparse
 import glob
@@ skipping 103 matching lines @@
     else:
       all_devices = device_utils.DeviceUtils.parallel(devices)
       msg = ('More than one device available.\n'
              'Use --device=SERIAL to select a device.\n'
              'Available devices:\n')
       descriptions = all_devices.pMap(lambda d: d.build_description).pGet(None)
       for d, desc in zip(devices, descriptions):
         msg += '  %s (%s)\n' % (d, desc)
       raise Exception(msg)
 
-  apk_help = apk_helper.ApkHelper(args.apk_path)
-  apk_package = apk_help.GetPackageName()
+  apk = apk_helper.ApkHelper(args.apk_path)
+  apk_package = apk.GetPackageName()
   device_incremental_dir = '/data/local/tmp/incremental-app-%s' % apk_package
 
   if args.uninstall:
     device.Uninstall(apk_package)
     device.RunShellCommand(['rm', '-rf', device_incremental_dir],
                            check_return=True)
     logging.info('Uninstall took %s seconds.', main_timer.GetDelta())
     return
 
   # Install .apk(s) if any of them have changed.
   def do_install():
     install_timer.Start()
     if args.splits:
       splits = []
       for split_glob in args.splits:
         splits.extend((f for f in glob.glob(split_glob)))
-      device.InstallSplitApk(args.apk_path, splits, reinstall=True,
+      device.InstallSplitApk(apk, splits, reinstall=True,
                              allow_cached_props=True, permissions=())
     else:
-      device.Install(args.apk_path, reinstall=True, permissions=())
+      device.Install(apk, reinstall=True, permissions=())
     install_timer.Stop(log=False)
 
   # Push .so and .dex files to the device (if they have changed).
   def do_push_files():
     if args.lib_dir:
       push_native_timer.Start()
       device_lib_dir = posixpath.join(device_incremental_dir, 'lib')
       device.PushChangedFiles([(args.lib_dir, device_lib_dir)],
                               delete_device_stale=True)
       push_native_timer.Stop(log=False)
@@ skipping 10 matching lines @@
           shutil.copyfile(src_path, os.path.join(temp_dir, dest_name))
         device.PushChangedFiles([(temp_dir, device_dex_dir)],
                                 delete_device_stale=True)
       push_dex_timer.Stop(log=False)
 
   def check_selinux():
     # Samsung started using SELinux before Marshmallow. There may be even more
     # cases where this is required...
     has_selinux = (device.build_version_sdk >= version_codes.MARSHMALLOW or
                    device.GetProp('selinux.policy_version'))
-    if has_selinux and apk_help.HasIsolatedProcesses():
+    if has_selinux and apk.HasIsolatedProcesses():
       raise Exception('Cannot use incremental installs on versions of Android '
                       'where isoloated processes cannot access the filesystem '
                       '(this includes Android M+, and Samsung L+) without '
                       'first disabling isoloated processes.\n'
                       'To do so, use GN arg:\n'
                       '    disable_incremental_isolated_processes=true')
 
   cache_path = '%s/files-cache.json' % device_incremental_dir
   def restore_cache():
     if not args.cache:
@@ skipping 41 matching lines @@
   logging.info(
       'Took %s seconds (setup=%s, install=%s, libs=%s, dex=%s, finalize=%s)',
       main_timer.GetDelta(), setup_timer.GetDelta(), install_timer.GetDelta(),
       push_native_timer.GetDelta(), push_dex_timer.GetDelta(),
       finalize_timer.GetDelta())
 
 
 if __name__ == '__main__':
   sys.exit(main())