| Index: build/android/test_runner.py
|
| diff --git a/build/android/test_runner.py b/build/android/test_runner.py
|
| index 2f5058fe564a7a4dacb2864bba77cf20f8c26f71..d79e4c724ed6d52e69aa95d0f5ace3189b36a506 100755
|
| --- a/build/android/test_runner.py
|
| +++ b/build/android/test_runner.py
|
| @@ -259,6 +259,11 @@ def AddInstrumentationTestOptions(option_parser):
|
| option_parser.add_option('--device-flags', dest='device_flags', default='',
|
| help='The relative filepath to a file containing '
|
| 'command-line flags to set on the device')
|
| + option_parser.add_option('--isolate_file_path',
|
| + '--isolate-file-path',
|
| + dest='isolate_file_path',
|
| + help='.isolate file path to override the default '
|
| + 'path')
|
|
|
|
|
| def ProcessInstrumentationOptions(options, error_func):
|
| @@ -322,7 +327,8 @@ def ProcessInstrumentationOptions(options, error_func):
|
| options.test_apk_jar_path,
|
| options.test_runner,
|
| options.test_support_apk_path,
|
| - options.device_flags
|
| + options.device_flags,
|
| + options.isolate_file_path
|
| )
|
|
|
|
|
| @@ -647,7 +653,8 @@ def _RunInstrumentationTests(options, error_func, devices):
|
| exit_code = 0
|
|
|
| if options.run_java_tests:
|
| - runner_factory, tests = instrumentation_setup.Setup(instrumentation_options)
|
| + runner_factory, tests = instrumentation_setup.Setup(
|
| + instrumentation_options, devices)
|
|
|
| test_results, exit_code = test_dispatcher.RunTests(
|
| tests, runner_factory, devices, shard=True, test_timeout=None,
|
|
|