Install support APK together with test APK

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 05a1c2b6a28af1b0628d04db0356968d7555743a..2e420df07973175903714df9e022c31de86a6341 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -277,6 +277,11 @@ def ProcessInstrumentationOptions(options, error_func):
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
       '%s.jar' %  options.test_apk)
 
+  options.test_support_apk_path = "%sSupport%s" % (

[jbudorick, 2014/06/19 15:35:09]

two nits:

1) single quote strings

2) can this just be:

  options.test_support_apk_path = '%Support%s' % (
      os.path.splitext(options.test_apk_path))

?

[aberent, 2014/06/20 16:52:37]

Both done.

On 2014/06/19 15:35:09, jbudorick wrote:

+        os.path.splitext(options.test_apk_path)[0],
+        os.path.splitext(options.test_apk_path)[1])
+
+
   return instrumentation_test_options.InstrumentationOptions(
       options.tool,
       options.cleanup_test_files,
@@ -291,7 +296,9 @@ def ProcessInstrumentationOptions(options, error_func):
       options.coverage_dir,
       options.test_apk,
       options.test_apk_path,
-      options.test_apk_jar_path)
+      options.test_apk_jar_path,
+      options.test_support_apk_path
+      )
 
 
 def AddUIAutomatorTestOptions(option_parser):