Make instrumentation test dependency on a support APK explicit

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 43387cb7ec3c11783c3d3a2b967697c6cd2a3a38..911700200cc77ec3a3057b87e4c0ee89c1de87ba 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -332,6 +332,10 @@ def AddInstrumentationTestOptions(parser):
                      help=('The name of the apk containing the tests '
                            '(without the .apk extension; '
                            'e.g. "ContentShellTest").'))
+  group.add_argument('--support-apk', dest='support_apk',

[jbudorick, 2015/06/24 17:46:39]

If possible, I'd vastly prefer we supply the path to the support apk. The name
thing is dated and confusing, and I'm generally trying to move away from it in
the test runner.

[dgn, 2015/06/24 21:29:50]

Providing them based on the output directory was fairly easy, but I'm not sure
how to get an absolute path in GYP. Would something based on printing $(pwd) be
ok? For GN, rebase_path on "/" would work

+                     help=('The name of the support apk to be installed '
+                           'alongside the test apk (without the .apk '
+                           'extension; e.g. "ContentShellSupportTest").'))
   group.add_argument('--coverage-dir',
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
@@ -379,8 +383,14 @@ def ProcessInstrumentationOptions(args):
       constants.GetOutDirectory(),
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
       '%s.jar' %  args.test_apk)
-  args.test_support_apk_path = '%sSupport%s' % (
-      os.path.splitext(args.test_apk_path))
+
+  if args.support_apk:
+    args.test_support_apk_path = os.path.join(
+        constants.GetOutDirectory(),
+        constants.SDK_BUILD_APKS_DIR,
+        '%s.apk' % args.support_apk)
+  else:
+    args.test_support_apk_path = None
 
   args.test_runner = apk_helper.GetInstrumentationName(args.test_apk_path)