[Android] emma_instr.py now removes any stale *.em/*sources.txt

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
 call one of the instrument commands, or the copy command.
 
 Possible commands are:
 - instrument_jar: Accepts a jar and instruments it using emma.jar.
-- instrument_classes: Accepts a directory contains java classes and instruments
-      it using emma.jar.
-- copy: Triggered instead of an instrumentation command when we don't have EMMA
-      coverage enabled. This allows us to make this a required step without
-      necessarily instrumenting on every build.
+- instrument_classes: Accepts a directory containing java classes and
+      instruments it using emma.jar.
+- copy: Called when EMMA coverage is not enabled. This allows us to make
+      this a required step without necessarily instrumenting on every build.
+      Also removes any stale coverage files.
 """
 
 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
 
 
 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 '
                                  'which to place the instrumented/copied jar.'))
   option_parser.add_option('--stamp', help='Path to touch when done.')
+  option_parser.add_option('--coverage-file',
+                           help='File to create with coverage metadata.')
+  option_parser.add_option('--sources-file',
+                           help='File to create with the list of sources.')
 
 
 def _AddInstrumentOptions(option_parser):
   """Adds options related to instrumentation to |option_parser|."""
   _AddCommonOptions(option_parser)
-  option_parser.add_option('--coverage-file',
-                           help='File to create with coverage metadata.')
-  option_parser.add_option('--sources-file',
-                           help='File to create with the list of sources.')
   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.')
 
 
 def _RunCopyCommand(command, options, args, option_parser):
-  """Just copies the jar from input to output locations.
+  """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.
 
   Returns:
     An exit code.
   """
-  if not (options.input_path and options.output_path):
+  if not (options.input_path and options.output_path and
+          options.coverage_file and options.sources_file):
     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)
+  if os.path.exists(coverage_file):
+    os.remove(coverage_file)
+  if os.path.exists(sources_file):
+    os.remove(sources_file)
+
   if os.path.isdir(options.input_path):
     shutil.rmtree(options.output_path, ignore_errors=True)
     shutil.copytree(options.input_path, options.output_path)
   else:
     shutil.copy(options.input_path, options.output_path)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
@@ skipping 91 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))