Add src configuration for Android user build bot

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 optparse
@@ skipping 65 matching lines @@
 
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['bb_compile']
   std_build_steps = ['bb_compile', 'bb_zip_build']
   std_test_steps = ['bb_extract_build']
   std_tests = ['ui', 'unit']
   flakiness_server = '--upload-to-flakiness-server'
+  extra_gyp = 'extra_gyp_defines'
 
-  B = BotConfig
+  def B(bot_id, bash_funs, test_obj=None, slave_props=None):
+    return BotConfig(bot_id, bash_funs, test_obj, slave_props)
+
   def T(tests, extra_args=None):
     return TestConfig(tests, extra_args)
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_run_findbugs',
-         'bb_zip_build'], None, None),
-      B('main-builder-rel',
-        ['bb_compile', 'bb_zip_build'], None, None),
-      B('main-clang-builder', compile_step, None, None),
-      B('main-clobber', compile_step, None, None),
-      B('main-tests', std_test_steps, T(std_tests, [flakiness_server]),
-        None),
+         'bb_zip_build']),
+      B('main-builder-rel', ['bb_compile', 'bb_zip_build']),
+      B('main-clang-builder', compile_step, slave_props={extra_gyp: 'clang=1'}),
+      B('main-clobber', compile_step),
+      B('main-tests', std_test_steps, T(std_tests, [flakiness_server])),
 
       # Other waterfalls
       B('asan-builder-tests', compile_step + ['bb_asan_tests_setup'],
-        T(std_tests, ['--asan']), {'extra_gyp_defines': 'asan=1'}),
+        T(std_tests, ['--asan']), {extra_gyp: 'asan=1'}),
       B('chromedriver-fyi-tests-dbg', std_test_steps,
-        T(['chromedriver'], ['--install=ChromiumTestShell']), None),
+        T(['chromedriver'], ['--install=ChromiumTestShell'])),
       B('fyi-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental',
-         'bb_run_findbugs', 'bb_zip_build'], None, None),
+         'bb_run_findbugs', 'bb_zip_build']),
       B('fyi-builder-rel',
-        ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None),
+        ['bb_compile', 'bb_compile_experimental', 'bb_zip_build']),
       B('fyi-tests-dbg-ics-gn', ['bb_compile', 'bb_compile_experimental'],
-        T(std_tests, ['--experimental', flakiness_server]), None),
+        T(std_tests, ['--experimental', flakiness_server])),
       B('fyi-tests', std_test_steps,
-        T(std_tests, ['--experimental', flakiness_server]), None),
+        T(std_tests, ['--experimental', flakiness_server])),
       B('fyi-component-builder-tests-dbg', compile_step,
-        T(std_tests, ['--experimental', flakiness_server]), None),
-      B('perf-tests-rel', std_test_steps,
-        T([], ['--install=ContentShell']),
-        None),
+        T(std_tests, ['--experimental', flakiness_server]),
+        {extra_gyp: 'component=shared_library'}),
+      B('perf-tests-rel', std_test_steps, T([], ['--install=ContentShell'])),
       B('webkit-latest-webkit-tests', std_test_steps,
-        T(['webkit_layout', 'webkit']), None),
-      B('webkit-latest-contentshell', compile_step, T(['webkit_layout']), None),
+        T(['webkit_layout', 'webkit'])),
+      B('webkit-latest-contentshell', compile_step, T(['webkit_layout'])),
+      B('builder-unit-tests', compile_step, T(['unit'])),
 
       # Generic builder config (for substring match).
-      B('builder', std_build_steps, None, None),
+      B('builder', std_build_steps),
   ]
 
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('lkgr-clobber', 'main-clobber'),
       ('try-builder-dbg', 'main-builder-dbg'),
       ('try-builder-rel', 'main-builder-rel'),
       ('try-clang-builder', 'main-clang-builder'),
@@ skipping 81 matching lines @@
           cwd=CHROME_SRC,
           env=dict(os.environ, BUILDBOT_TESTING='1'))
     else:
       return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))