[Android] Enable passing filter string to emma.

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 39 matching lines @@
 
 def _AddInstrumentOptions(option_parser):
   """Adds options related to instrumentation to |option_parser|."""
   _AddCommonOptions(option_parser)
   option_parser.add_option('--sources',
                            help='Space separated list of sources.')
   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, 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.
@@ skipping 73 matching lines @@
           options.coverage_file and options.sources_file and options.sources and
           options.src_root and options.emma_jar):
     option_parser.error('All arguments are required.')
 
   coverage_file = os.path.join(os.path.dirname(options.output_path),
                                options.coverage_file)
   sources_file = os.path.join(os.path.dirname(options.output_path),
                               options.sources_file)
   temp_dir = tempfile.mkdtemp()
   try:
-    # TODO(gkanwar): Add '-ix' option to filter out useless classes.
-    build_utils.CheckCallDie(['java', '-cp', options.emma_jar,
-                              'emma', 'instr',
-                              '-ip', options.input_path,
-                              '-d', temp_dir,
-                              '-out', coverage_file,
-                              '-m', 'fullcopy'], suppress_output=True)
+    cmd = ['java', '-cp', options.emma_jar,
+           'emma', 'instr',
+           '-ip', options.input_path,
+           '-ix', options.filter_string,
+           '-d', temp_dir,
+           '-out', coverage_file,
+           '-m', 'fullcopy']
+    build_utils.CheckCallDie(cmd, suppress_output=True)
 
     if command == 'instrument_jar':
       for jar in os.listdir(os.path.join(temp_dir, 'lib')):
         shutil.copy(os.path.join(temp_dir, 'lib', jar),
                     options.output_path)
     else:  # 'instrument_classes'
       if os.path.isdir(options.output_path):
         shutil.rmtree(options.output_path, ignore_errors=True)
       shutil.copytree(os.path.join(temp_dir, 'classes'),
                       options.output_path)
@@ skipping 21 matching lines @@
 
 
 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.argv))