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 f02e161fa0621b727815cc55fbf89c2c50724a16..aaadd905882fe6dd5e051eb45fc1ca67fcecf08f 100755
--- a/masters/master.tryserver.webrtc/master.cfg
+++ b/masters/master.tryserver.webrtc/master.cfg
@@ -44,7 +44,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('src/build', 'linux2', url, branch,
+                                        nohooks_on_update=True,
+                                        target_os='android')
 normal_tests = [
     'audio_coding_module_test',
     'audio_coding_unittests',
@@ -95,76 +98,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 = {
@@ -203,6 +206,21 @@ b_linux_asan = {
         })
 }
 
+b_android_ndk = {
+    'name': 'android_ndk',
+    'factory': android().WebRTCAndroidNDKFactory(
+        target='Debug',
+        slave_type='AnnotatedTrybot',
+        annotation_script='src/build/android/buildbot/bb_run_bot.py',
+        factory_properties={
+            # This ID is not in bb_run_bot.py yet so it will use the generic
+            # builder config for now.
+            'android_bot_id': 'webrtc-builder',
+            'buildtool': 'ninja',
+            'ndk_apps' : ['src/webrtc/video_engine/test/android/build_demo.py']
+        })
+}
+
 c['builders'] = [
   b_win,
   b_win_rel,
@@ -214,6 +232,7 @@ c['builders'] = [
   b_linux_memcheck,
   b_linux_tsan,
   b_linux_asan,
+  b_android_ndk,
 ]
 
 # Slaves are loaded from slaves.cfg.
@@ -250,6 +269,7 @@ def CreateBuilderPools(pool_name):
   pools[pool_name].append('linux_memcheck')
   pools[pool_name].append('linux_tsan')
   pools[pool_name].append('linux_asan')
+  pools[pool_name].append('android_ndk')
   return pools
 
 # Configure the Schedulers;