Add Android NDK build for WebRTC

scripts/master/factory/webrtc_factory.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from master.factory import gclient_factory
 from master.factory import chromium_commands
-
+from master.factory import webrtc_commands
 import config
 
 
 class WebRTCFactory(gclient_factory.GClientFactory):
 
   CUSTOM_VARS_ROOT_DIR = ('root_dir', 'src')
   # Can't use the same Valgrind constant as in chromium_factory.py, since WebRTC
   # uses another path (use_relative_paths=True in DEPS).
   CUSTOM_DEPS_VALGRIND = ('third_party/valgrind',
      config.Master.trunk_url + '/deps/third_party/valgrind/binaries')
 
   def __init__(self, build_dir, target_platform, svn_root_url, branch,
-               custom_deps_list=None):
+               custom_deps_list=None, nohooks_on_update=False, target_os=None):
     """Creates a WebRTC factory.
 
     This factory can also be used to build stand-alone projects.
 
     Args:
       build_dir: Directory to perform the build relative to. Usually this is
         trunk/build for WebRTC and other projects.
       target_platform: Platform, one of 'win32', 'darwin', 'linux2'
       svn_root_url: Subversion root URL (i.e. without branch/trunk part).
       branch: Branch name to checkout.
       custom_deps_list: Content to be put in the custom_deps entry of the
         .gclient file for the default solution. The parameter must be a list
         of tuples with two strings in each: path and remote URL.
+      nohooks_on_update: If True, no hooks will be executed in the update step.
+      target_os: Used to sync down OS-specific dependencies, if specified.
     """
     svn_url = svn_root_url + '/' + branch
     # Use root_dir=src since many Chromium scripts rely on that path.
     custom_vars_list = [self.CUSTOM_VARS_ROOT_DIR]
     solutions = []
     solutions.append(gclient_factory.GClientSolution(
         svn_url, name='src', custom_vars_list=custom_vars_list,
         custom_deps_list=custom_deps_list))
     if config.Master.webrtc_internal_url:
       solutions.append(gclient_factory.GClientSolution(
           config.Master.webrtc_internal_url, name='webrtc-internal',
           custom_vars_list=custom_vars_list))
     gclient_factory.GClientFactory.__init__(self, build_dir, solutions,
-                                            target_platform=target_platform)
+                                            target_platform=target_platform,
+                                            nohooks_on_update=nohooks_on_update,
+                                            target_os=target_os)
 
   def WebRTCFactory(self, target='Debug', clobber=False, tests=None, mode=None,
                     slave_type='BuilderTester', options=None,
                     compile_timeout=1200, build_url=None, project=None,
                     factory_properties=None, gclient_deps=None):
     options = options or ''
     tests = tests or []
     factory_properties = factory_properties or {}
 
     if factory_properties.get('needs_valgrind'):
@@ skipping 18 matching lines @@
     gyp_defines = gclient_env.get('GYP_DEFINES', '')
     for test in tests:
       if 'build_for_tool=memcheck' in gyp_defines:
         cmds.AddMemoryTest(test, 'memcheck',
                            factory_properties=factory_properties)
       elif 'build_for_tool=tsan' in gyp_defines:
         cmds.AddMemoryTest(test, 'tsan', factory_properties=factory_properties)
       else:
         cmds.AddAnnotatedGTestTestStep(test, factory_properties)
     return factory
+
+  def WebRTCAndroidNDKFactory(self, annotation_script,

[Isaac (away), 2013/03/18 17:54:21]

I would rather us use ChromiumAnnotationFactory if possible.  What things does
this have that the standard annotation factory lacks?  Is it something we could
add?

[kjellander_chromium, 2013/03/21 15:46:17]

Due to the fact that the WebRTC NDK demo application does not compile as a part
of a normal GYP target, it will not be compiled by bb_run_bot.py. I don't see an
easy way to add that.
That's why I created this factory that adds an additional step to handle that.
As soon https://code.google.com/p/webrtc/issues/detail?id=1029 is resolved, I
can remove this and use a plain ChromiumAnnotationFactory.

+                              branch='master',
+                              target='Release',
+                              slave_type='AnnotatedBuilderTester',
+                              clobber=False,
+                              compile_timeout=6000,
+                              project=None,
+                              factory_properties=None, options=None,
+                              tests=None,
+                              gclient_deps=None):
+    """Annotation-driven factory to build WebRTC with the Android NDK.
+    """
+    factory_properties = factory_properties or {}
+    options = options or {}
+
+    factory = self.BuildFactory(target=target, clobber=clobber,
+                                tests=tests, mode=None, slave_type=slave_type,
+                                options=options,
+                                compile_timeout=compile_timeout, build_url=None,
+                                project=project,
+                                factory_properties=factory_properties,
+                                gclient_deps=gclient_deps)
+
+    # Get the factory command object to create new steps to the factory.
+    cmds = webrtc_commands.WebRTCCommands(
+        factory=factory,
+        target=target,
+        build_dir=self._build_dir,
+        target_platform=self._target_platform,
+        target_os=self._target_os)
+
+    # Add the main build.
+    env = factory_properties.get('annotation_env')
+    factory_properties['target'] = target
+    factory_properties.setdefault('clobber', clobber)
+    cmds.AddAnnotationStep('build', annotation_script, env=env,
+                           factory_properties=factory_properties)
+
+    # Add compilation of NDK apps, assuming they can run as annotation scripts.
+    ndk_apps_list = factory_properties.get('ndk_apps')
+    if ndk_apps_list:
+      for ndk_app in ndk_apps_list:
+        cmds.AddAnnotationStep('ndk_app', ndk_app, env=env,
+                               factory_properties=factory_properties)
+    return factory
+