| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from master import master_config | 5 from master import master_config |
| 6 from master.factory import annotator_factory |
| 6 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 7 | 8 |
| 8 defaults = {} | 9 defaults = {} |
| 9 | 10 |
| 10 helper = master_config.Helper(defaults) | 11 helper = master_config.Helper(defaults) |
| 11 B = helper.Builder | 12 B = helper.Builder |
| 12 F = helper.Factory | 13 F = helper.Factory |
| 13 S = helper.Scheduler | 14 S = helper.Scheduler |
| 14 T = helper.Triggerable | 15 T = helper.Triggerable |
| 15 | 16 |
| 16 def linux_android(): return chromium_factory.ChromiumFactory( | 17 def linux_android(): |
| 18 return chromium_factory.ChromiumFactory( |
| 17 '', 'linux2', nohooks_on_update=True, target_os='android') | 19 '', 'linux2', nohooks_on_update=True, target_os='android') |
| 18 | 20 |
| 19 defaults['category'] = '5android' | 21 defaults['category'] = '5android' |
| 20 | 22 |
| 21 android_dbg_archive = master_config.GetArchiveUrl( | 23 android_dbg_archive = master_config.GetArchiveUrl( |
| 22 'ChromiumLinux', | 24 'ChromiumLinux', |
| 23 'Android Builder (dbg)', | 25 'Android Builder (dbg)', |
| 24 'Android_Builder__dbg_', | 26 'Android_Builder__dbg_', |
| 25 'linux') | 27 'linux') |
| 26 | 28 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 85 |
| 84 B('Android Clang Builder (dbg)', 'f_android_clang_dbg', 'android', 'android', | 86 B('Android Clang Builder (dbg)', 'f_android_clang_dbg', 'android', 'android', |
| 85 notify_on_missing=True) | 87 notify_on_missing=True) |
| 86 F('f_android_clang_dbg', linux_android().ChromiumAnnotationFactory( | 88 F('f_android_clang_dbg', linux_android().ChromiumAnnotationFactory( |
| 87 target='Debug', | 89 target='Debug', |
| 88 annotation_script='src/build/android/buildbot/bb_run_bot.py', | 90 annotation_script='src/build/android/buildbot/bb_run_bot.py', |
| 89 factory_properties={ | 91 factory_properties={ |
| 90 'android_bot_id': 'main-clang-builder-dbg', | 92 'android_bot_id': 'main-clang-builder-dbg', |
| 91 })) | 93 })) |
| 92 | 94 |
| 95 B('Android Webview AOSP Builder', 'f_android_webview_aosp_rel', 'android', |
| 96 'android', notify_on_missing=True) |
| 97 F('f_android_webview_aosp_rel', |
| 98 annotator_factory.AnnotatorFactory().BaseFactory('android_webview_aosp')) |
| 93 | 99 |
| 94 def Update(config_arg, active_master, c): | 100 |
| 101 def Update(_config_arg, _active_master, c): |
| 95 return helper.Update(c) | 102 return helper.Update(c) |
| OLD | NEW |