Install support APK together with test APK

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 collections
 import logging
@@ skipping 259 matching lines @@
 
 
   options.test_apk_path = os.path.join(constants.GetOutDirectory(),
                                        constants.SDK_BUILD_APKS_DIR,
                                        '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(
       constants.GetOutDirectory(),
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
       '%s.jar' %  options.test_apk)
 
+  options.test_support_apk_path = '%sSupport%s' % (
+        os.path.splitext(options.test_apk_path))
+
+
   return instrumentation_test_options.InstrumentationOptions(
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
       options.annotations,
       options.exclude_annotations,
       options.test_filter,
       options.test_data,
       options.save_perf_json,
       options.screenshot_failures,
       options.wait_for_debugger,
       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):
   """Adds UI Automator test options to |option_parser|."""
 
   option_parser.usage = '%prog uiautomator [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
       '%prog uiautomator --test-jar=chrome_shell_uiautomator_tests'
       ' --package=chrome_shell')
@@ skipping 513 matching lines @@
 
 def main():
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())