🎣 Reland of Make Android .build_configs aware of prebuilts and java sources

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 40 matching lines @@
   """Adds options related to instrumentation to |option_parser|."""
   _AddCommonOptions(option_parser)
   option_parser.add_option('--source-dirs',
                            help='Space separated list of source directories. '
                                 'source-files should not be specified if '
                                 'source-dirs is specified')
   option_parser.add_option('--source-files',
                            help='Space separated list of source files. '
                                 'source-dirs should not be specified if '
                                 'source-files is specified')
+  option_parser.add_option('--java-sources-file',
+                           help='File containing newline-separated .java paths')
   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.'))
 
 
@@ skipping 24 matching lines @@
   shutil.copy(options.input_path, options.output_path)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile,
                              build_utils.GetPythonDependencies())
 
 
-def _GetSourceDirsFromSourceFiles(source_files_string):
-  """Returns list of directories for the files in |source_files_string|.
+def _GetSourceDirsFromSourceFiles(source_files):
+  """Returns list of directories for the files in |source_files|.
 
   Args:
-    source_files_string: String generated from GN or GYP containing the list
-      of source files.
+    source_files: List of source files.
 
   Returns:
     List of source directories.
   """
-  source_files = build_utils.ParseGypList(source_files_string)
   return list(set(os.path.dirname(source_file) for source_file in source_files))
 
 
 def _CreateSourcesListFile(source_dirs, sources_list_file, src_root):
   """Adds all normalized source directories to |sources_list_file|.
 
   Args:
     source_dirs: List of source directories.
     sources_list_file: File into which to write the JSON list of sources.
     src_root: Root which sources added to the file should be relative to.
@@ skipping 25 matching lines @@
         this function.
     options: optparse options dictionary.
     args: List of extra args from optparse.
     option_parser: optparse.OptionParser object.
 
   Returns:
     An exit code.
   """
   if not (options.input_path and options.output_path and
           options.coverage_file and options.sources_list_file and
-          (options.source_files or options.source_dirs) and
+          (options.source_files or options.source_dirs or
+           options.java_sources_file) and
           options.src_root and options.emma_jar):
     option_parser.error('All arguments are required.')
 
   if os.path.exists(options.coverage_file):
     os.remove(options.coverage_file)
   temp_dir = tempfile.mkdtemp()
   try:
     cmd = ['java', '-cp', options.emma_jar,
            'emma', 'instr',
            '-ip', options.input_path,
@@ skipping 17 matching lines @@
     # input_path is a hardlink to output_path. http://crbug.com/571642
     if os.path.exists(options.output_path):
       os.unlink(options.output_path)
     shutil.move(os.path.join(temp_jar_dir, jars[0]), options.output_path)
   finally:
     shutil.rmtree(temp_dir)
 
   if options.source_dirs:
     source_dirs = build_utils.ParseGypList(options.source_dirs)
   else:
-    source_dirs = _GetSourceDirsFromSourceFiles(options.source_files)
+    source_files = []
+    if options.source_files:
+      source_files += build_utils.ParseGypList(options.source_files)
+    if options.java_sources_file:
+      with open(options.java_sources_file) as f:
+        source_files.extend(l.strip() for l in f)
+    source_dirs = _GetSourceDirsFromSourceFiles(source_files)
+
+  # TODO(GYP): In GN, we are passed the list of sources, detecting source
+  # directories, then walking them to re-establish the list of sources.
+  # This can obviously be simplified!
   _CreateSourcesListFile(source_dirs, options.sources_list_file,
                          options.src_root)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile,
                              build_utils.GetPythonDependencies())
 
@@ skipping 11 matching lines @@
 
 
 def main():
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())