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

Unified Diff: masters/master.client.webrtc/master_linux_cfg.py

Issue 11896066: Add Android NDK build for WebRTC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: WebRTCFactory now inherits from ChromiumFactory. 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 | « no previous file | masters/master.client.webrtc/slaves.cfg » ('j') | masters/master.tryserver.webrtc/master.cfg » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.client.webrtc/master_linux_cfg.py
diff --git a/masters/master.client.webrtc/master_linux_cfg.py b/masters/master.client.webrtc/master_linux_cfg.py
index e7aed4ec83157c6603f62e120723e5b79fdee97b..5832e80517743bccab0e7234f21929a2d5754ecf 100644
--- a/masters/master.client.webrtc/master_linux_cfg.py
+++ b/masters/master.client.webrtc/master_linux_cfg.py
@@ -3,6 +3,7 @@
# found in the LICENSE file.
from master import master_config
+from master.factory import chromium_factory
from master.factory import webrtc_factory
defaults = {}
@@ -12,6 +13,11 @@ def ConfigureBuilders(c, svn_url, branch, category, custom_deps_list=None):
def linux():
return webrtc_factory.WebRTCFactory('src/build', 'linux2', svn_url,
branch, custom_deps_list)
+ def android():
+ return webrtc_factory.WebRTCFactory('', 'linux2', svn_url,
+ branch, nohooks_on_update=True,
+ target_os='android')
+
helper = master_config.Helper(defaults)
B = helper.Builder
F = helper.Factory
@@ -113,6 +119,17 @@ def ConfigureBuilders(c, svn_url, branch, category, custom_deps_list=None):
{'GYP_DEFINES': ('asan=1 release_extra_cflags=-g '
' linux_use_tcmalloc=0 ')}}))
+ # Android.
+ B('Android NDK', 'android_ndk_factory', scheduler=scheduler)
+ F('android_ndk_factory', android().ChromiumAnnotationFactory(
+ target='Debug',
+ slave_type='AnnotatedBuilderTester',
+ annotation_script='src/build/android/buildbot/bb_run_bot.py',
+ factory_properties={
+ 'android_bot_id': 'builder',
+ 'buildtool': 'ninja',
+ }))
+
# ChromeOS.
B('CrOS', 'chromeos_factory', scheduler=scheduler)
F('chromeos_factory', linux().WebRTCFactory(
« no previous file with comments | « no previous file | masters/master.client.webrtc/slaves.cfg » ('j') | masters/master.tryserver.webrtc/master.cfg » ('J')

Powered by Google App Engine
This is Rietveld 408576698