[Android] Add support for external sharding to the test runner.

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 45 matching lines @@
       '--num_retries', '--num-retries',
       dest='num_retries', type=int, default=2,
       help='Number of retries for a test before '
            'giving up (default: %(default)s).')
   parser.add_argument(
       '--test-launcher-summary-output',
       '--json-results-file',
       dest='json_results_file', type=os.path.realpath,
       help='If set, will dump results in JSON form '
            'to specified file.')
+  parser.add_argument(
+      '--test-launcher-shard-index',
+      type=int, default=os.environ.get('GTEST_SHARD_INDEX', 0),
+      help='Index of the external shard to run.')
+  parser.add_argument(
+      '--test-launcher-total-shards',
+      type=int, default=os.environ.get('GTEST_TOTAL_SHARDS', 1),
+      help='Total number of external shards.')
 
   return parser
 
 
 def AddTracingOptions(parser):
   # TODO(shenghuazhang): Move this into AddCommonOptions once it's supported
   # for all test types.
   parser.add_argument(
       '--trace-output',
       metavar='FILENAME', type=os.path.realpath,
@@ skipping 79 matching lines @@
   AddTestLauncherArgs(parser)
 
 
 def ProcessCommonOptions(args):
   """Processes and handles all common options."""
   run_tests_helper.SetLogLevel(args.verbose_count)
   constants.SetBuildType(args.build_type)
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
 
-  # Some things such as Forwarder require ADB to be in the environment path.
-  adb_dir = os.path.dirname(constants.GetAdbPath())
-  if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
-    os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']

[bpastene, 2017/03/14 01:03:47]

Removing adb from PATH? That sounds scary. (and also unrelated to this cl?)

[jbudorick, 2017/03/14 15:36:01]

oops, this should be in the prior CL in the chain.

-
 
 def AddDeviceOptions(parser):
   """Adds device options to |parser|."""
 
   parser = parser.add_argument_group('device arguments')
 
   parser.add_argument(
       '--adb-path',
       type=os.path.realpath,
       help='Specify the absolute path of the adb binary that '
@@ skipping 694 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())