Android Add _incremental targets for instrumentation tests

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index ce5af45b79b32dee080f6b672b3e504ef3b15e43..e7bd230d5f225c0687c4afde20e1f481438c45b3 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -138,12 +138,14 @@ class GtestTestInstance(test_instance.TestInstance):
     self._skip_clear_data = args.skip_clear_data
     self._suite = args.suite_name[0]
 
-    incremental_part = '_incremental' if args.incremental_install else ''
+    self._exe_path = os.path.join(constants.GetOutDirectory(),
+                                  self._suite)
+
+    incremental_part = '_incremental' if args.test_apk_install_script else ''
     apk_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % self._suite,
         '%s-debug%s.apk' % (self._suite, incremental_part))
-    self._exe_path = os.path.join(constants.GetOutDirectory(),
-                                  self._suite)
+    self._test_apk_install_script = args.test_apk_install_script
     if not os.path.exists(apk_path):
       self._apk_helper = None
     else:
@@ -257,6 +259,10 @@ class GtestTestInstance(test_instance.TestInstance):
     return self._suite
 
   @property
+  def test_apk_install_script(self):

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

Hm. These don't really belong in the test_instance, as they're not generic to
gtests but instead are specific to (gtest + local) (and similarly for the
instrumentation ones)

Unfortunately, in my limited wisdom, I didn't give the arguments to the
test_runs at construction time, so I guess I'm ok with this for now.

+    return self._test_apk_install_script
+
+  @property
   def test_arguments(self):
     return self._test_arguments