Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: masters/master.tryserver.webrtc/master.cfg

Issue 11896066: Add Android NDK build for WebRTC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Updating android_bot_id for build+trybot Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « masters/master.client.webrtc/slaves.cfg ('k') | masters/master.tryserver.webrtc/slaves.cfg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.tryserver.webrtc/master.cfg
diff --git a/masters/master.tryserver.webrtc/master.cfg b/masters/master.tryserver.webrtc/master.cfg
index 2160bb23bef771da479381f1f7e4cc39b2cfa846..ccf38acb882b773e907572757682edc963b95677 100755
--- a/masters/master.tryserver.webrtc/master.cfg
+++ b/masters/master.tryserver.webrtc/master.cfg
@@ -11,6 +11,7 @@
from master import master_utils
from master import slaves_list
from master.builders_pools import BuildersPools
+from master.factory import chromium_factory
from master.factory import webrtc_factory
from master.try_job_http import TryJobHTTP
from master.try_mail_notifier import TryMailNotifier
@@ -44,6 +45,10 @@ def mac():
return webrtc_factory.WebRTCFactory('src/xcodebuild', 'darwin', url, branch)
def win():
return webrtc_factory.WebRTCFactory('src/build', 'win32', url, branch)
+def android():
+ return webrtc_factory.WebRTCFactory('', 'linux2', url, branch,
+ nohooks_on_update=True,
+ target_os='android')
normal_tests = [
'audio_coding_module_test',
@@ -98,76 +103,76 @@ win_factory_prop = {
b_win = {
'name': 'win',
'factory': win().WebRTCFactory(
- target='Debug',
- slave_type='Trybot',
- options=options,
- project=win_project,
- tests=normal_tests,
- factory_properties=win_factory_prop)
+ target='Debug',
+ slave_type='Trybot',
+ options=options,
+ project=win_project,
+ tests=normal_tests,
+ factory_properties=win_factory_prop)
}
b_win_rel = {
'name': 'win_rel',
'factory': win().WebRTCFactory(
- target='Release',
- slave_type='Trybot',
- options=options,
- project=win_project,
- tests=normal_tests,
- factory_properties=win_factory_prop)
+ target='Release',
+ slave_type='Trybot',
+ options=options,
+ project=win_project,
+ tests=normal_tests,
+ factory_properties=win_factory_prop)
}
# Mac.
b_mac = {
'name': 'mac',
'factory': mac().WebRTCFactory(
- target='Debug',
- slave_type='Trybot',
- options=mac_options,
- tests=normal_tests,
- factory_properties=mac_factory_prop)
+ target='Debug',
+ slave_type='Trybot',
+ options=mac_options,
+ tests=normal_tests,
+ factory_properties=mac_factory_prop)
}
b_mac_rel = {
'name': 'mac_rel',
'factory': mac().WebRTCFactory(
- target='Release',
- slave_type='Trybot',
- options=mac_options,
- tests=normal_tests,
- factory_properties=mac_factory_prop)
+ target='Release',
+ slave_type='Trybot',
+ options=mac_options,
+ tests=normal_tests,
+ factory_properties=mac_factory_prop)
}
b_mac_asan = {
'name': 'mac_asan',
'factory': mac().WebRTCFactory(
- target='Release',
- slave_type='Trybot',
- options=mac_options,
- tests=normal_tests,
- factory_properties={
- 'asan': True,
- 'gclient_env': {'GYP_DEFINES': asan_gyp_defines,
- 'GYP_GENERATORS': 'ninja'},
- })
+ target='Release',
+ slave_type='Trybot',
+ options=mac_options,
+ tests=normal_tests,
+ factory_properties={
+ 'asan': True,
+ 'gclient_env': {'GYP_DEFINES': asan_gyp_defines,
+ 'GYP_GENERATORS': 'ninja'},
+ })
}
# Linux.
b_linux = {
'name': 'linux',
'factory': linux().WebRTCFactory(
- target='Debug',
- slave_type='Trybot',
- options=options,
- tests=normal_tests)
+ target='Debug',
+ slave_type='Trybot',
+ options=options,
+ tests=normal_tests)
}
b_linux_rel = {
'name': 'linux_rel',
'factory': linux().WebRTCFactory(
- target='Release',
- slave_type='Trybot',
- tests=normal_tests)
+ target='Release',
+ slave_type='Trybot',
+ tests=normal_tests)
}
b_linux_memcheck = {
@@ -206,6 +211,17 @@ b_linux_asan = {
})
}
+b_android_ndk = {
+ 'name': 'android_ndk',
+ 'factory': android().ChromiumAnnotationFactory(
+ target='Debug',
+ slave_type='AnnotatedTrybot',
+ annotation_script='src/build/android/buildbot/bb_run_bot.py',
+ factory_properties={
+ 'android_bot_id': 'webrtc-trybot-builder-dbg',
+ })
+}
+
c['builders'] = [
b_win,
b_win_rel,
@@ -217,6 +233,7 @@ c['builders'] = [
b_linux_memcheck,
b_linux_tsan,
b_linux_asan,
+ b_android_ndk,
]
# Slaves are loaded from slaves.cfg.
@@ -252,6 +269,7 @@ pools['webrtc'].append('linux_rel')
pools['webrtc'].append('linux_memcheck')
pools['webrtc'].append('linux_tsan')
pools['webrtc'].append('linux_asan')
+pools['webrtc'].append('android_ndk')
# Configure the Schedulers;
c['schedulers'] = []
« no previous file with comments | « masters/master.client.webrtc/slaves.cfg ('k') | masters/master.tryserver.webrtc/slaves.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698