| Index: build/android/pylib/linker/setup.py
|
| diff --git a/build/android/pylib/linker/setup.py b/build/android/pylib/linker/setup.py
|
| index a863a0d8638b53c1d9b5d862a94c45b77724648a..a13ea4d78b27315311e126e31170d4aa79308e69 100644
|
| --- a/build/android/pylib/linker/setup.py
|
| +++ b/build/android/pylib/linker/setup.py
|
| @@ -6,17 +6,19 @@
|
|
|
| import os
|
| import sys
|
| +import types
|
| +
|
| +import test_case
|
| +import test_runner
|
|
|
| from pylib import constants
|
| -from pylib.linker import test_case
|
| -from pylib.linker import test_runner
|
|
|
| sys.path.insert(0,
|
| os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
|
| 'common'))
|
| -import unittest_util # pylint: disable=F0401
|
| +import unittest_util
|
|
|
| -def Setup(options, _devices):
|
| +def Setup(options, devices):
|
| """Creates a list of test cases and a runner factory.
|
|
|
| Returns:
|
| @@ -37,7 +39,7 @@ def Setup(options, _devices):
|
| all_tests = [t for t in all_tests \
|
| if t.qualified_name in filtered_test_names]
|
|
|
| - def TestRunnerFactory(device, _shard_index):
|
| + def TestRunnerFactory(device, shard_index):
|
| return test_runner.LinkerTestRunner(
|
| device, options.tool, options.push_deps,
|
| options.cleanup_test_files)
|
|
|