Make instrumentation test dependency on a support APK explicit

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 314 matching lines @@
                      help='Root of the host-driven tests.')
   group.add_argument('-w', '--wait_debugger', dest='wait_for_debugger',
                      action='store_true',
                      help='Wait for debugger.')
   group.add_argument('--apk-under-test', dest='apk_under_test',
                      help=('the name of the apk under test.'))
   group.add_argument('--test-apk', dest='test_apk', required=True,
                      help=('The name of the apk containing the tests '
                            '(without the .apk extension; '
                            'e.g. "ContentShellTest").'))
+  group.add_argument('--support-apk', dest='support_apk',
+                     help=('The path to an optional support apk to be '
+                           'installed alongside the test apk. The '
+                           'path should be relative to the output '
+                           'directory (--output-directory).'))
   group.add_argument('--coverage-dir',
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
   group.add_argument('--device-flags', dest='device_flags', default='',
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--device-flags-file', default='',
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--isolate_file_path',
@@ skipping 27 matching lines @@
     args.run_python_tests = False
 
   args.test_apk_path = os.path.join(
       constants.GetOutDirectory(),
       constants.SDK_BUILD_APKS_DIR,
       '%s.apk' % args.test_apk)
   args.test_apk_jar_path = os.path.join(
       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(),
+        args.support_apk)
+  else:
+    args.test_support_apk_path = None
 
   args.test_runner = apk_helper.GetInstrumentationName(args.test_apk_path)
 
   # TODO(jbudorick): Get rid of InstrumentationOptions.
   return instrumentation_test_options.InstrumentationOptions(
       args.tool,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
       args.test_data,
@@ skipping 653 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())