Revert of Enable presubmit pylint in build/android.

build/android/gyp/emma_instr.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.
 
 """Instruments classes and jar files.
 
 This script corresponds to the 'emma_instr' action in the java build process.
 Depending on whether emma_instrument is set, the 'emma_instr' action will either
@@ skipping 11 matching lines @@
 import collections
 import json
 import os
 import shutil
 import sys
 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):
   """Adds common options to |option_parser|."""
   option_parser.add_option('--input-path',
                            help=('Path to input file(s). Either the classes '
                                  'directory, or the path to a jar.'))
   option_parser.add_option('--output-path',
                            help=('Path to output final file(s) to. Either the '
                                  'final classes directory, or the directory in '
@@ skipping 13 matching lines @@
   option_parser.add_option('--src-root',
                            help='Root of the src repository.')
   option_parser.add_option('--emma-jar',
                            help='Path to emma.jar.')
   option_parser.add_option(
       '--filter-string', default='',
       help=('Filter string consisting of a list of inclusion/exclusion '
             '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.
 
   Args:
     command: String indicating the command that was received to trigger
         this function.
     options: optparse options dictionary.
     args: List of extra args from optparse.
     option_parser: optparse.OptionParser object.
@@ skipping 45 matching lines @@
              % (abs_source, src_root))
       return 1
     rel_source = os.path.relpath(abs_source, src_root)
 
     relative_sources.append(rel_source)
 
   with open(sources_file, 'w') as f:
     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:
     command: 'instrument_jar' or 'instrument_classes'. This distinguishes
         whether we copy the output from the created lib/ directory, or classes/
         directory.
     options: optparse options dictionary.
     args: List of extra args from optparse.
     option_parser: optparse.OptionParser object.
 
@@ skipping 47 matching lines @@
 VALID_COMMANDS = {
     'copy': CommandFunctionTuple(_AddCommonOptions,
                                  _RunCopyCommand),
     'instrument_jar': CommandFunctionTuple(_AddInstrumentOptions,
                                            _RunInstrumentCommand),
     'instrument_classes': CommandFunctionTuple(_AddInstrumentOptions,
                                                _RunInstrumentCommand),
 }
 
 
-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))