[Android] Buildbot changes for EMMA code coverage

build/android/buildbot/bb_run_bot.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 copy
 import json
 import os
 import pipes
 import re
 import subprocess
 import sys
 
 import bb_utils
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import constants
 
 
+CHROMIUM_COVERAGE_BUCKET = 'chromium-code-coverage'
+
 _BotConfig = collections.namedtuple(
     'BotConfig', ['bot_id', 'host_obj', 'test_obj'])
 
 HostConfig = collections.namedtuple(
     'HostConfig',
     ['script', 'host_steps', 'extra_args', 'extra_gyp_defines', 'target_arch'])
 
 TestConfig = collections.namedtuple('Tests', ['script', 'tests', 'extra_args'])
 
 
@@ skipping 105 matching lines @@
       B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])),
 
       # Other waterfalls
       B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'),
         T(std_tests, ['--asan'])),
       B('chromedriver-fyi-tests-dbg', H(std_test_steps),
         T(['chromedriver'], ['--install=ChromiumTestShell'])),
       B('fyi-x86-builder-dbg',
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
-        H(std_build_steps + std_host_tests, experimental)),
+        H(std_build_steps + std_host_tests, experimental,
+          extra_gyp='emma_coverage=1')),
       B('x86-builder-dbg',
         H(compile_step + std_host_tests, target_arch='x86')),
       B('fyi-builder-rel', H(std_build_steps,  experimental)),
       B('fyi-tests', H(std_test_steps),
-        T(std_tests, ['--experimental', flakiness_server])),
+        T(std_tests, ['--experimental', flakiness_server,
+                      '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET])),
       B('fyi-component-builder-tests-dbg',
         H(compile_step, extra_gyp='component=shared_library'),
         T(std_tests, ['--experimental', flakiness_server])),
       B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])),
       B('perf-tests-rel', H(std_test_steps),
         T([], ['--install=ChromiumTestShell'])),
       B('webkit-latest-webkit-tests', H(std_test_steps),
         T(['webkit_layout', 'webkit'], ['--auto-reconnect'])),
       B('webkit-latest-contentshell', H(compile_step),
         T(['webkit_layout'], ['--auto-reconnect'])),
@@ skipping 101 matching lines @@
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
   env = GetEnvironment(bot_config.host_obj, options.testing)
   return RunBotCommands(options, commands, env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))