Android Add _incremental targets for instrumentation tests

build/android/pylib/local/device/local_device_test_run.py

Index: build/android/pylib/local/device/local_device_test_run.py
diff --git a/build/android/pylib/local/device/local_device_test_run.py b/build/android/pylib/local/device/local_device_test_run.py
index 7387bb9a5baaffa9e61f4a7f88f84c19711fb4d7..22db05d53ba159db2f35ffc9e03b364f21b1b9d2 100644
--- a/build/android/pylib/local/device/local_device_test_run.py
+++ b/build/android/pylib/local/device/local_device_test_run.py
@@ -4,16 +4,38 @@
 
 import fnmatch
 import functools
+import imp
 import logging
 
 from devil import base_error
 from devil.android import device_errors
+from incremental_install import installer

[jbudorick, 2016/02/09 20:08:27]

this is going to sound unusual, but please move this inside IncrementalInstall.

[agrieve, 2016/02/09 21:43:50]

Done.

 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.base import test_collection
 
 
+def IncrementalInstall(device, apk_helper, installer_script):
+  """Performs an incremental install.
+
+  Args:
+    device: Device to install on.
+    apk_helper: ApkHelper instance for the _incremental.apk.
+    installer_script: Path to the installer script for the incremental apk.
+  """
+  try:
+    install_wrapper = imp.load_source('install_wrapper', installer_script)
+  except IOError:
+    raise Exception('Incremental install script not found: %s\n' %
+                    installer_script)
+  params = install_wrapper.GetInstallParameters()
+
+  installer.Install(device, apk_helper, split_globs=params['splits'],
+                    native_libs=params['native_libs'],
+                    dex_files=params['dex_files'])
+
+
 def handle_shard_failures(f):
   """A decorator that handles device failures for per-device functions.