WebRTC: Add gyp_script parameter to ios recipe module's run_mb call.

scripts/slave/recipes/webrtc/ios.py

 # Copyright 2016 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.
 
 DEPS = [
   'chromium_tests',
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'ios',
   'recipe_engine/path',
@@ skipping 20 matching lines @@
       'ios',
   )
   buildername = api.properties['buildername'].replace(' ', '_')
   api.ios.read_build_config(build_config_base_dir=build_config_base_dir,
                             buildername=buildername)
   mb_config_path = api.path['checkout'].join(
       'webrtc',
       'build',
       'mb_config.pyl',
   )
-  api.ios.build(mb_config_path=mb_config_path)
+  gyp_script = api.path['checkout'].join(
+      'webrtc',
+      'build',
+      'gyp_webrtc.py',
+  )
+  api.ios.build(mb_config_path=mb_config_path, gyp_script=gyp_script)
   api.ios.test()
 
 
 def GenTests(api):
   yield (
     api.test('basic')
     + api.platform('mac', 64)
     + api.properties(
       buildername='ios debug',
       buildnumber='0',
       mastername='chromium.fake',
       slavename='fake-vm',
       path_config='kitchen',
     )
     + api.ios.make_test_build_config({
       'xcode version': 'fake xcode version',
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
         'use_goma': '1',
       },
       'compiler': 'ninja',

[ehmaldonado_chromium, 2016/08/11 09:39:11]

Shouldn't there be a 'mb_type': 'gyp' here as well?

[kjellander_chromium, 2016/08/11 09:49:58]

Good catch! Updated in PS#2.

       'configuration': 'Debug',
       'sdk': 'iphonesimulator8.0',
       'tests': [
         {
           'app': 'fake tests 1',
           'device type': 'fake device',
           'os': '8.0',
         },
         {
           'app': 'fake tests 2',
@@ skipping 40 matching lines @@
       slavename='fake-vm',
       path_config='kitchen',
     )
     + api.ios.make_test_build_config({
       'xcode version': 'fake xcode version',
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
         'use_goma': '1',
       },
+      'mb_type': 'gyp',
       'compiler': 'ninja',
       'configuration': 'Release',
       'sdk': 'iphoneos8.0',
       'tests': [
       ],
     })
   )
 
   yield (
     api.test('trybot')
     + api.platform('mac', 64)
     + api.properties(
       buildername='ios',
       buildnumber='0',
       mastername='chromium.fake',
       slavename='fake-vm',
       path_config='kitchen',
     )
     + api.ios.make_test_build_config({
       'xcode version': 'fake xcode version',
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
         'use_goma': '1',
       },
       'use_analyze': 'false',
+      'mb_type': 'gyp',
       'compiler': 'ninja',
       'configuration': 'Release',
       'sdk': 'iphoneos8.0',
       'tests': [
       ],
     })
   )
 
   yield (
     api.test('test_failure')
     + api.platform('mac', 64)
     + api.properties(patch_url='patch url')
     + api.properties(
       buildername='ios',
       buildnumber='0',
       mastername='chromium.fake',
       slavename='fake-vm',
       path_config='kitchen',
     )
     + api.ios.make_test_build_config({
       'xcode version': 'fake xcode version',
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
       },
+      'mb_type': 'gyp',
       'compiler': 'xcodebuild',
       'configuration': 'Debug',
       'sdk': 'iphonesimulator8.0',
       'tests': [
         {
           'app': 'fake tests 1',
           'device type': 'fake device',
           'os': '8.0',
         },
         {
@@ skipping 18 matching lines @@
       mastername='chromium.fake',
       slavename='fake-vm',
       path_config='kitchen',
     )
     + api.ios.make_test_build_config({
       'xcode version': 'fake xcode version',
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
       },
+      'mb_type': 'gyp',
       'compiler': 'ninja',
       'configuration': 'Debug',
       'sdk': 'iphonesimulator8.0',
       'tests': [
         {
           'app': 'fake tests 1',
           'device type': 'fake device',
           'os': '8.0',
         },
         {
           'app': 'fake tests 2',
           'device type': 'fake device',
           'os': '7.1',
         },
       ],
     })
     + api.step_data(
       'fake tests 1 (fake device iOS 8.0)',
       retcode=2,
     )
   )