Add Android device testers for WebRTC.

scripts/master/factory/chromium_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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 1187 matching lines @@
                                         tests=None, mode=None,
                                         slave_type='BuilderTester',
                                         options=None, compile_timeout=1200,
                                         build_url=None, project=None,
                                         factory_properties=None):
     self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_WEBRTC_STABLE]
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)
 
+  def ChromiumWebRTCAndroidFactory(self, annotation_script,
+                                   branch='master',
+                                   target='Release',
+                                   slave_type='AnnotatedBuilderTester',
+                                   clobber=False,
+                                   compile_timeout=6000,
+                                   project=None,
+                                   factory_properties=None, options=None,
+                                   tests=None,
+                                   gclient_deps=None):
+    self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_WEBRTC_TRUNK]
+    if self._target_os == 'android':

[Isaac (away), 2013/08/27 06:15:27]

Do you need this conditional?  Looks like the deps file is a no-op on
non-android already.

[kjellander_chromium, 2013/08/27 08:14:42]

You're right, I don't. I'll just always add it instead.

+      self._solutions.append(gclient_factory.GClientSolution(
+          config.Master.trunk_url + '/deps/third_party/webrtc/webrtc.DEPS',
+          name='webrtc.DEPS'))
+    return self.ChromiumAnnotationFactory(annotation_script=annotation_script,
+                                          branch=branch,
+                                          target=target,
+                                          slave_type=slave_type,
+                                          clobber=clobber,
+                                          compile_timeout=compile_timeout,
+                                          project=project,
+                                          factory_properties=factory_properties,
+                                          options=options,
+                                          tests=tests,
+                                          gclient_deps=gclient_deps)
+
   def ChromiumAVPerfFactory(self, target='Release', clobber=False, tests=None,
                               mode=None, slave_type='BuilderTester',
                               options=None, compile_timeout=1200,
                               build_url=None, project=None,
                               factory_properties=None):
     self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_AVPERF]
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)
 
@@ skipping 189 matching lines @@
                                                build_dir=web_build_dir)
       chromium_cmd_obj.AddChromebotServer(factory_properties)
       chromium_cmd_obj.AddReliabilityTests(client_os)
     elif slave_type == 'ChromebotClient':
       chromium_cmd_obj.AddGetBuildForChromebot(client_os,
                                                extract=True,
                                                build_url=build_url)
       chromium_cmd_obj.AddChromebotClient(factory_properties)
 
     return factory