| Index: build/android/pylib/gtest/setup.py
|
| diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
|
| index 6ea06fc3d8ad67db7f9dade5af63e917648c2b53..86718bff50ee8cd6bccf1cc2bbb83a382940f6a0 100644
|
| --- a/build/android/pylib/gtest/setup.py
|
| +++ b/build/android/pylib/gtest/setup.py
|
| @@ -14,11 +14,10 @@ import sys
|
| from pylib import android_commands
|
| from pylib import cmd_helper
|
| from pylib import constants
|
| -from pylib import ports
|
|
|
| -import test_package_apk
|
| -import test_package_exe
|
| -import test_runner
|
| +from . import test_package_apk
|
| +from . import test_package_exe
|
| +from . import test_runner
|
|
|
| sys.path.insert(0,
|
| os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
|
| @@ -61,8 +60,8 @@ _WEBRTC_ISOLATE_FILE_PATHS = {
|
| }
|
|
|
| # Append the WebRTC tests with the full path from Chromium's src/ root.
|
| -for test, isolate_path in _WEBRTC_ISOLATE_FILE_PATHS.items():
|
| - _ISOLATE_FILE_PATHS[test] = 'third_party/webrtc/%s' % isolate_path
|
| +for webrtc_test, isolate_path in _WEBRTC_ISOLATE_FILE_PATHS.items():
|
| + _ISOLATE_FILE_PATHS[webrtc_test] = 'third_party/webrtc/%s' % isolate_path
|
|
|
| # Used for filtering large data deps at a finer grain than what's allowed in
|
| # isolate files since pushing deps to devices is expensive.
|
| @@ -293,7 +292,7 @@ def Setup(test_options, devices):
|
| _GenerateDepsDirUsingIsolate(test_options.suite_name)
|
|
|
| # Constructs a new TestRunner with the current options.
|
| - def TestRunnerFactory(device, shard_index):
|
| + def TestRunnerFactory(device, _shard_index):
|
| return test_runner.TestRunner(
|
| test_options,
|
| device,
|
|
|