[Android] Buildbot changes for EMMA code coverage

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 30 matching lines @@
                            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.')
 
 
 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')
+                           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.')
 
 
@@ skipping 63 matching lines @@
     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_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', options.coverage_file,
+                              '-out', coverage_file,
                               '-m', 'fullcopy'], 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)
   finally:
     shutil.rmtree(temp_dir)
 
-  _CreateSourcesFile(options.sources, options.sources_file, options.src_root)
+  _CreateSourcesFile(options.sources, sources_file, options.src_root)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
   return 0
 
 
 CommandFunctionTuple = collections.namedtuple(
     'CommandFunctionTuple', ['add_options_func', 'run_command_func'])
 VALID_COMMANDS = {
     'copy': CommandFunctionTuple(_AddCommonOptions,
                                  _RunCopyCommand),
     'instrument_jar': CommandFunctionTuple(_AddInstrumentOptions,
                                            _RunInstrumentCommand),
     'instrument_classes': CommandFunctionTuple(_AddInstrumentOptions,
                                                _RunInstrumentCommand),
 }
 
 
 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))