Android Add _incremental targets for instrumentation tests

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

 # Copyright 2014 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.
 
 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.
 
   Args:
     f: the function being decorated. The function must take at least one
       argument, and that argument must be the device.
   """
   return handle_shard_failures_with(None)(f)
 
 
@@ skipping 136 matching lines @@
     return test
 
   def _GetTests(self):
     raise NotImplementedError
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError