Add Android NDK build for WebRTC

masters/master.tryserver.webrtc/master.cfg

 #!/usr/bin/env python
 #  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 #  Use of this source code is governed by a BSD-style license
 #  that can be found in the LICENSE file in the root of the source
 #  tree. An additional intellectual property rights grant can be found
 #  in the file PATENTS.  All contributing project authors may
 #  be found in the AUTHORS file in the root of the source tree.
 
 # These modules come from scripts, which must be in the PYTHONPATH.
 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
 
 import config
 
 ActiveMaster = config.Master.WebRTCTryServer
 
 MAIL_NOTIFIER = True
 LISTEN_TO_SVN = ActiveMaster.svn_url and ActiveMaster.is_production_host
@@ skipping 13 matching lines @@
 ####### BUILDERS
 url = config.Master.webrtc_url
 branch = 'trunk'
 
 def linux():
   return webrtc_factory.WebRTCFactory('src/build', 'linux2', url, branch)
 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',
     'audio_coding_unittests',
     'audio_decoder_unittests',
     'audioproc_unittest',
     'bitrate_controller_unittests',
     'channel_transport_unittests',
     'common_video_unittests',
     'media_file_unittests',
@@ skipping 33 matching lines @@
 win_factory_prop = {
     'gclient_env': {'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1'}
 }
 
 # Set up all the builders.
 
 # Windows.
 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 = {
     'name': 'linux_memcheck',
     'factory': linux().WebRTCFactory(
         target='Release',
         slave_type='Trybot',
         tests=memcheck_tests,
         factory_properties={
             'needs_valgrind': True,
@@ skipping 18 matching lines @@
     'factory': linux().WebRTCFactory(
         target='Release',
         slave_type='Trybot',
         tests=normal_tests,
         factory_properties={
             'asan': True,
             'gclient_env': {'GYP_DEFINES': asan_gyp_defines},
         })
 }
 
+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,
   b_mac,
   b_mac_rel,
   b_mac_asan,
   b_linux,
   b_linux_rel,
   b_linux_memcheck,
   b_linux_tsan,
   b_linux_asan,
+  b_android_ndk,
 ]
 
 # Slaves are loaded from slaves.cfg.
 slaves = slaves_list.SlavesList('slaves.cfg', 'WebRTCTryServer')
 
 for builder in c['builders']:
   # Associate the slaves to the builders. The configuration is in slaves.cfg.
   builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
   # Don't enable auto_reboot for our bots (Chrome uses it since they don't trust
   # their unit tests to clean up properly)
@@ skipping 15 matching lines @@
 pools['webrtc'].append('win')
 pools['webrtc'].append('win_rel')
 pools['webrtc'].append('mac')
 pools['webrtc'].append('mac_rel')
 pools['webrtc'].append('mac_asan')
 pools['webrtc'].append('linux')
 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'] = []
 
 last_good_urls = {'webrtc': ActiveMaster.last_good_url}
 code_review_sites = {'webrtc': ActiveMaster.code_review_site}
 
 c['schedulers'].append(TryJobHTTP(
     name='webrtc_try_job_http',
     port=ActiveMaster.try_job_port,
@@ skipping 49 matching lines @@
 c['buildCacheSize'] = 100
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.webrtc/'