[Android] Add a cleanup option to generate_emma_html.py.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import hashlib
 import multiprocessing
 import os
@@ skipping 331 matching lines @@
 
 
 def GenerateJavaCoverageReport(options):
   """Generates an HTML coverage report using EMMA and uploads it."""
   bb_annotations.PrintNamedStep('java_coverage_report')
 
   coverage_html = os.path.join(options.coverage_dir, 'coverage_html')
   RunCmd(['build/android/generate_emma_html.py',
           '--coverage-dir', options.coverage_dir,
           '--metadata-dir', os.path.join(CHROME_SRC, 'out', options.target),
+          '--cleanup',
           '--output', os.path.join(coverage_html, 'index.html')])
   UploadCoverageData(options, coverage_html, 'java')
 
 
 def LogcatDump(options):
   # Print logcat, kill logcat monitor
   bb_annotations.PrintNamedStep('logcat_dump')
   logcat_file = os.path.join(CHROME_SRC, 'out', options.target, 'full_log')
   with open(logcat_file, 'w') as f:
     RunCmd([
@@ skipping 16 matching lines @@
     SpawnLogcatMonitor()
 
     # Run all device setup steps
     for _, cmd in GetDeviceSetupStepCmds():
       cmd(options)
 
     if options.install:
       test_obj = INSTRUMENTATION_TESTS[options.install]
       InstallApk(options, test_obj, print_step=True)
 
-    if options.coverage_bucket:
-      RunCmd(['rm', '-rf', options.coverage_dir])
-
     if options.test_filter:
       bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
 
     if options.coverage_bucket:
       GenerateJavaCoverageReport(options)
 
     if options.experimental:
       RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
 
   finally:
@@ skipping 49 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_SRC, 'out', options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))