Add Android NDK build for WebRTC

masters/master.tryserver.webrtc/master.cfg

Index: masters/master.tryserver.webrtc/master.cfg
diff --git a/masters/master.tryserver.webrtc/master.cfg b/masters/master.tryserver.webrtc/master.cfg
index 82898d7d0a5425ce05d25ab9db98176744a57529..f5339079e2310bda635b61bb607c6f3ab16267aa 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/build', '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',
@@ -97,76 +102,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 = {
@@ -205,6 +210,18 @@ 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': 'builder',

[Isaac (away), 2013/04/19 08:52:41]

please use 'webrtc-builder-dbg'.  The goal of this field is for every slave to
have a different ID.

[kjellander_chromium, 2013/04/19 09:58:53]

OK I used 'webrtc-builder-dbg' for the buildbot and 'webrtc-trybot-builder-dbg'
for the trybot.

When I tried 'webrtc-try-builder-dbg' it picked up the 'try-builder-dbg'
configuration, which fails on the 'Check licenses for WebView' step for us. I
figured just changing the string would make it default back to the 'builder'
step instead. Doesn't feel very safe for future changes of bb_run_bot.py though,
what do you think?


On 2013/04/19 08:52:41, Isaac wrote:

+            'buildtool': 'ninja',

[Isaac (away), 2013/04/19 08:52:41]

this field is not needed anymore, you can delete.

[kjellander_chromium, 2013/04/19 09:58:53]

Done.

+        })
+}
+
 c['builders'] = [
   b_win,
   b_win_rel,
@@ -216,6 +233,7 @@ c['builders'] = [
   b_linux_memcheck,
   b_linux_tsan,
   b_linux_asan,
+  b_android_ndk,
 ]
 
 # Slaves are loaded from slaves.cfg.
@@ -251,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'] = []