Index: build/android/gyp/emma_instr.py |
diff --git a/build/android/gyp/emma_instr.py b/build/android/gyp/emma_instr.py |
index b043c29a83669cd766d82848df2548c1c238677c..8d97ed38ae1c6030fa69ad936626b7843cfc91e3 100755 |
--- a/build/android/gyp/emma_instr.py |
+++ b/build/android/gyp/emma_instr.py |
@@ -29,7 +29,7 @@ import tempfile |
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir)) |
from pylib.utils import command_option_parser |
-from util import build_utils # pylint: disable=F0401 |
+from util import build_utils |
def _AddCommonOptions(option_parser): |
@@ -63,7 +63,7 @@ def _AddInstrumentOptions(option_parser): |
'patterns separated with whitespace and/or comma.')) |
-def _RunCopyCommand(_command, options, _, option_parser): |
+def _RunCopyCommand(command, options, args, option_parser): |
"""Copies the jar from input to output locations. |
Also removes any old coverage/sources file. |
@@ -129,7 +129,7 @@ def _CreateSourcesFile(sources_string, sources_file, src_root): |
json.dump(relative_sources, f) |
-def _RunInstrumentCommand(command, options, _, option_parser): |
+def _RunInstrumentCommand(command, options, args, option_parser): |
"""Instruments the classes/jar files using EMMA. |
Args: |
@@ -197,11 +197,11 @@ VALID_COMMANDS = { |
} |
-def main(): |
+def main(argv): |
option_parser = command_option_parser.CommandOptionParser( |
commands_dict=VALID_COMMANDS) |
command_option_parser.ParseAndExecute(option_parser) |
if __name__ == '__main__': |
- sys.exit(main()) |
+ sys.exit(main(sys.argv)) |