Index: masters/master.chromium.fyi/master.cfg |
=================================================================== |
--- masters/master.chromium.fyi/master.cfg (revision 110985) |
+++ masters/master.chromium.fyi/master.cfg (working copy) |
@@ -108,6 +108,7 @@ |
'Mac Aura', |
'Linux ChromeOS Aura', |
'Chromium OS ASAN Builder', |
+ 'Chromium Linux Android' |
]) |
# Scheduler to trigger slaves that depend on the release and debug builds. |
@@ -218,6 +219,8 @@ |
def win_build(): return F('src/build', 'win32') |
def mac(): return F('src/build', 'darwin') |
def linux(): return F('src/build', 'linux2') |
+def linux_android(): return F('', 'linux2', nohooks_on_update=True) |
+ |
def codesearch(): |
return F('src/build', 'linux2', pull_internal=False, full_checkout=True, |
additional_svn_urls=[config.Master.trunk_url_tools, |
@@ -869,7 +872,14 @@ |
'target_arch=ia32'} |
}) |
+f_chromium_rel_linux_android = linux_android().ChromiumAnnotationFactory( |
+ target='Release', |
+ annotation_script='src/build/android/buildbot.sh', |
+ # At this time, we use the default deps in gclient (e.g. 'unix') |
+ # gclient_deps='android' |
+ ) |
+ |
# ---------------------------------------------------------------------------- |
# BUILDER DEFINITIONS |
@@ -1170,6 +1180,12 @@ |
'category': 'ASan', |
} |
+b_chromium_rel_linux_android = { |
+ 'name': 'Chromium Linux Android', |
+ 'factory': f_chromium_rel_linux_android, |
+ 'category': 'android' |
+} |
+ |
c['builders'] = [ |
b_chromium_rel_builder, |
b_chromium_rel_perf_frame, |
@@ -1213,6 +1229,7 @@ |
b_chromium_dbg_mac_aura, |
b_chromium_dbg_linux_chromeos_aura, |
b_chromium_rel_chromeos_asan_builder, |
+ b_chromium_rel_linux_android, |
] |
# Associate the slaves to the manual builders. The configuration is in |