Android: upstream latest changes for build/android.

build/android/pylib/test_options_parser.py

 # Copyright (c) 2012 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.
 
 """Parses options for the instrumentation tests."""
 
 import constants
 import optparse
 import os
 import sys
@@ skipping 95 matching lines @@
                                  'sharding.'))
   option_parser.add_option('--official-build', help='Run official build tests.')
   option_parser.add_option('--device',
                            help='Serial number of device we should use.')
   option_parser.add_option('--python_test_root',
                            help='Root of the python-driven tests.')
   option_parser.add_option('--flakiness-dashboard-server',
                            dest='flakiness_dashboard_server',
                            help=('Address of the server that is hosting the '
                                  'Chrome for Android flakiness dashboard.'))
+  option_parser.add_option('--buildbot-step-failure',
+                           action='store_true',
+                           help=('If present, will set the buildbot status '
+                                 'as STEP_FAILURE, otherwise as STEP_WARNINGS '
+                                 'when test(s) fail.'))
+
 
 def ValidateInstrumentationOptions(option_parser, options, args):
   """Validate options/arguments and populate options with defaults."""
   if len(args) > 1:
     option_parser.print_help(sys.stderr)
     option_parser.error('Unknown arguments: %s' % args[1:])
   if options.java_only and options.python_only:
     option_parser.error('Options java_only (-j) and python_only (-p) '
                         'are mutually exclusive.')
 
   options.run_java_tests = True
   options.run_python_tests = True
   if options.java_only:
     options.run_python_tests = False
   elif options.python_only:
     options.run_java_tests = False
 
-  options.test_apk_path = os.path.join(_SDK_OUT_DIR,
-                                       options.build_type,
-                                       constants.SDK_BUILD_APKS_DIR,
-                                       '%s.apk' % options.test_apk)
-  options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
-                                           options.build_type,
-                                           constants.SDK_BUILD_TEST_JAVALIB_DIR,
-                                           '%s.jar' % options.test_apk)
+  if os.path.exists(options.test_apk):
+    # The APK is fully qualified, assume the JAR lives along side.
+    options.test_apk_path = options.test_apk
+    options.test_apk_jar_path = os.path.splitext(options.test_apk_path) + '.jar'
+  else:
+    options.test_apk_path = os.path.join(_SDK_OUT_DIR,
+                                         options.build_type,
+                                         constants.SDK_BUILD_APKS_DIR,
+                                         '%s.apk' % options.test_apk)
+    options.test_apk_jar_path = os.path.join(
+        _SDK_OUT_DIR, options.build_type, constants.SDK_BUILD_TEST_JAVALIB_DIR,
+        '%s.jar' %  options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']