[Android] Add sharding for AMP instrumentation tests.

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 109 matching lines @@
 
 def AddRemoteDeviceOptions(parser):
   group = parser.add_argument_group('Remote Device Options')
 
   group.add_argument('--trigger',
                      help=('Only triggers the test if set. Stores test_run_id '
                            'in given file path. '))
   group.add_argument('--collect',
                      help=('Only collects the test results if set. '
                            'Gets test_run_id from given file path.'))
+  group.add_argument('--num-shards', type=int,
+                     help='Number of devices to shard the test across.')
   group.add_argument('--remote-device', action='append',
                      help='Device type to run test on.')
-  group.add_argument('--results-path',
-                     help='File path to download results to.')
+  group.add_argument('--results-dir',
+                     help='Directory to put the downloaded results files in.')
   group.add_argument('--api-protocol',
                      help='HTTP protocol to use. (http or https)')
   group.add_argument('--api-address',
                      help='Address to send HTTP requests.')
   group.add_argument('--api-port',
                      help='Port to send HTTP requests to.')
-  group.add_argument('--runner-type',
-                     help='Type of test to run as.')
+  group.add_argument('--test-framework',
+                     help='Test framework to run test.')
   group.add_argument('--runner-package',
                      help='Package name of test.')
   group.add_argument('--device-type',
                      choices=constants.VALID_DEVICE_TYPES,
                      help=('Type of device to run on. iOS or android'))
   group.add_argument('--device-oem', action='append',
                      help='Device OEM to run on.')
   group.add_argument('--remote-device-file',
                      help=('File with JSON to select remote device. '
                            'Overrides all other flags.'))
@@ skipping 849 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())