Updates to WebRTC Baremetal recipe

scripts/slave/recipe_modules/webrtc/gclient_config.py

Index: scripts/slave/recipe_modules/webrtc/gclient_config.py
diff --git a/scripts/slave/recipe_modules/webrtc/gclient_config.py b/scripts/slave/recipe_modules/webrtc/gclient_config.py
index 0c55c12c5ad02681971867d88bc9a06c8639c78f..880bdb07894548a6c8fe5d2523c9072302061dcb 100644
--- a/scripts/slave/recipe_modules/webrtc/gclient_config.py
+++ b/scripts/slave/recipe_modules/webrtc/gclient_config.py
@@ -8,16 +8,12 @@ from slave.recipe_modules.gclient.config import ChromeSvnSubURL,\
   ChromiumSvnSubURL
 
 
-@CONFIG_CTX()
+@CONFIG_CTX(includes=['webrtc', '_webrtc_limited'])
 def webrtc_standalone(c):
-  s = c.solutions.add()
-  s.name = 'src'
-  s.url = 'http://webrtc.googlecode.com/svn/trunk'
-  s.custom_vars['root_dir'] = 'src'
   c.got_revision_mapping['webrtc'] = 'got_revision'
 
 
-@CONFIG_CTX(includes=['chromium', '_webrtc_additional_solutions'])
+@CONFIG_CTX(includes=['chromium', '_webrtc_limited'])
 def webrtc_android_apk(c):
   c.target_os = ['android']
 
@@ -27,6 +23,13 @@ def webrtc_android_apk(c):
   c.solutions[0].custom_deps['src/third_party/webrtc'] = (
        'http://webrtc.googlecode.com/svn/trunk/webrtc')
 
+  # The webrtc.DEPS solution pulls in additional resources needed for running
+  # WebRTC-specific test setups in Chrome.
+  s = c.solutions.add()

[kjellander_chromium, 2014/02/25 14:31:13]

This was moved here since it's currently only used by the Android APK builds
(and will be if we add our Chromium WebRTC builds later on). It's just a waste
of traffic to sync these things for standalone WebRTC builds right now.

+  s.name = 'webrtc.DEPS'
+  s.url = ChromiumSvnSubURL(c, 'chrome', 'trunk', 'deps', 'third_party',
+                            'webrtc', 'webrtc.DEPS')
+
 
 @CONFIG_CTX(includes=['webrtc_android_apk'])
 def webrtc_android_apk_try_builder(c):
@@ -34,12 +37,18 @@ def webrtc_android_apk_try_builder(c):
 
 
 @CONFIG_CTX()
-def _webrtc_additional_solutions(c):
-  """Helper config for loading additional solutions.
+def webrtc(c):
+  s = c.solutions.add()
+  s.name = 'src'
+  s.url = 'http://webrtc.googlecode.com/svn/trunk'
+  s.custom_vars['root_dir'] = 'src'
+
+
+@CONFIG_CTX()
+def _webrtc_limited(c):
+  """Helper config for loading the webrtc-limited solution.
 
   The webrtc-limited solution contains non-redistributable code.
-  The webrtc.DEPS solution pulls in additional resources needed for running
-  WebRTC-specific test setups.
   """
   if c.GIT_MODE:
     raise BadConf('WebRTC only supports svn')
@@ -47,8 +56,4 @@ def _webrtc_additional_solutions(c):
   s = c.solutions.add()
   s.name = 'webrtc-limited'
   s.url = ChromeSvnSubURL(c, 'chrome-internal', 'trunk', 'webrtc-limited')
-
-  s = c.solutions.add()
-  s.name = 'webrtc.DEPS'
-  s.url = ChromiumSvnSubURL(c, 'chrome', 'trunk', 'deps', 'third_party',
-                            'webrtc', 'webrtc.DEPS')
+  s.custom_vars['root_dir'] = 'src'

[kjellander_chromium, 2014/02/25 14:31:13]

Local testing on Windows showed that this is needed in order to get the deps
checked out in the right place.