Revert of Revert "[Android] Switch b/a/test_runner.py from optparse to argparse."

build/android/pylib/constants.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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 # pylint: disable=W0212
 
 import collections
 import logging
 import os
@@ skipping 184 matching lines @@
   'gyp_py_unittests': {
     'path': os.path.join(DIR_SOURCE_ROOT, 'build', 'android', 'gyp'),
     'test_modules': [
       'java_cpp_enum_tests',
     ]
   },
 }
 
 LOCAL_MACHINE_TESTS = ['junit', 'python']
 VALID_ENVIRONMENTS = ['local']
+VALID_TEST_TYPES = ['gtest', 'instrumentation', 'junit', 'linker', 'monkey',
+                    'perf', 'python', 'uiautomator']
 
 
 def GetBuildType():
   try:
     return os.environ['BUILDTYPE']
   except KeyError:
     raise Exception('The BUILDTYPE environment variable has not been set')
 
 
 def SetBuildType(build_type):
@@ skipping 57 matching lines @@
     with file(os.devnull, 'w') as devnull:
       subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
     return 'adb'
   except OSError:
     logging.debug('No adb found in $PATH, fallback to checked in binary.')
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88