iOS: Update MB and JSON configs + enable Goma

webrtc/build/mb_config.pyl

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # FOR DETAILS ON THIS FILE SEE THE MAIN COPY IN //tools/mb/mb_config.pyl.
 # This is configuration for standalone WebRTC bots. It is used to keep the bot
 # configurations source-side instead of in the buildbot scripts. That makes it
 # easy to try different configurations of GYP and GN in tryjob patches.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # above). mb uses this dict to look up which config to use for a given bot.
   # The builders should be sorted by the order they appear in the /builders
   # page on the buildbots, *not* alphabetically.
   'masters': {
     'client.webrtc': {
       # iOS
-      'iOS32 Debug': 'ios_gyp_debug_bot_arm_device',
+      'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device',
       'iOS32 Release': 'ios_gyp_release_bot_arm_device',
-      'iOS64 Debug': 'ios_gyp_debug_bot_arm64_device',
+      'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device',
       'iOS64 Release': 'ios_gyp_release_bot_arm64_device',
-      'iOS32 Debug Simulator': 'ios_gyp_debug_bot_x86',
-      'iOS64 Debug Simulator': 'ios_gyp_debug_bot_x64',
-      'iOS64 Debug (GN)': 'ios_gn_debug_bot_arm64_device',
+      'iOS32 Debug Simulator': 'ios_gyp_debug_static_bot_x86',
+      'iOS64 Debug Simulator': 'ios_gyp_debug_static_bot_x64',
+      'iOS64 Debug (GN)': 'ios_gn_debug_static_bot_arm64_device',
       'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
 
       # Mac
       'Mac64 Debug': 'gyp_debug_bot_x64',
       'Mac64 Release': 'gyp_release_bot_x64',
       'Mac64 Debug (GN)': 'gn_debug_bot_x64',
       'Mac64 Release (GN)': 'gn_release_bot_x64',
       'Mac Asan': 'mac_gyp_asan_clang_release_bot_x64',
       'Mac64 Release [large tests]': 'gyp_release_bot_x64',
 
@@ skipping 42 matching lines @@
       'Win32 Release (Clang)': 'win_gyp_clang_release_bot_x86',
       'Win64 Debug (Clang)': 'win_gyp_clang_debug_bot_x64',
       'Win64 Release (Clang)': 'win_gyp_clang_release_bot_x64',
       'Win SyzyASan': 'win_gyp_syzyasan_release_bot_x86',
       'Win DrMemory Full': 'win_gyp_drmemory_debug_bot_x86',
       'Win DrMemory Light': 'win_gyp_drmemory_debug_bot_x86',
       'Win32 Release [large tests]': 'gyp_release_bot_x86',
     },
     'tryserver.webrtc': {
       # iOS
-      'ios_dbg': 'ios_gyp_debug_bot_arm_device',
+      'ios_dbg': 'ios_gyp_debug_static_bot_arm_device',
       'ios_rel': 'ios_gyp_release_bot_arm_device',
-      'ios_arm64_dbg': 'ios_gyp_debug_bot_arm64_device',
+      'ios_arm64_dbg': 'ios_gyp_debug_static_bot_arm64_device',
       'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device',
-      'ios32_sim_dbg': 'ios_gyp_debug_bot_x86',
-      'ios64_sim_dbg': 'ios_gyp_debug_bot_x64',
-      'ios64_gn_dbg': 'ios_gn_debug_bot_arm64_device',
+      'ios32_sim_dbg': 'ios_gyp_debug_static_bot_x86',
+      'ios64_sim_dbg': 'ios_gyp_debug_static_bot_x64',
+      'ios64_gn_dbg': 'ios_gn_debug_static_bot_arm64_device',
       'ios64_gn_rel': 'ios_gn_release_bot_arm64_device',
 
       # Mac
       'mac_compile_dbg': 'gyp_debug_bot_x64',
       'mac_compile_rel': 'gyp_release_bot_x64',
       'mac_dbg': 'gyp_debug_bot_x64',
       'mac_rel': 'gyp_release_bot_x64',
       'mac_gn_dbg': 'gn_debug_bot_x64',
       'mac_gn_rel': 'gn_release_bot_x64',
       'mac_asan': 'mac_gyp_asan_clang_release_bot_x64',
@@ skipping 57 matching lines @@
     },
   },
 
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     # iOS
-    'ios_gn_debug_bot_arm64_device': [
-      'ios', 'gn', 'ios_debug_bot', 'arm64', 'device'
+    'ios_gn_debug_static_bot_arm64_device': [
+      'ios', 'gn', 'debug_static_bot', 'arm64', 'device'
     ],
     'ios_gn_release_bot_arm64_device': [
-      'ios', 'gn', 'ios_release_bot', 'arm64', 'device'
+      'ios', 'gn', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_bot_arm_device': [
-      'ios', 'gyp', 'ios_debug_bot', 'arm', 'device'
+    'ios_gyp_debug_static_bot_arm_device': [
+      'ios', 'gyp', 'debug_static_bot', 'arm', 'device'
     ],
     'ios_gyp_release_bot_arm_device': [
-      'ios', 'gyp', 'ios_release_bot', 'arm', 'device'
+      'ios', 'gyp', 'release_bot', 'arm', 'device'
     ],
-    'ios_gyp_debug_bot_arm64_device': [
-      'ios', 'gyp', 'ios_debug_bot', 'arm64', 'device'
+    'ios_gyp_debug_static_bot_arm64_device': [
+      'ios', 'gyp', 'debug_static_bot', 'arm64', 'device'
     ],
     'ios_gyp_release_bot_arm64_device': [
-      'ios', 'gyp', 'ios_release_bot', 'arm64', 'device'
+      'ios', 'gyp', 'release_bot', 'arm64', 'device'
     ],
-    'ios_gyp_debug_bot_x86': [
-      'ios', 'gyp', 'ios_debug_bot', 'x86'
+    'ios_gyp_debug_static_bot_x86': [
+      'ios', 'gyp', 'debug_static_bot', 'x86'
     ],
-    'ios_gyp_debug_bot_x64': [
-      'ios', 'gyp', 'ios_release_bot', 'x64'
+    'ios_gyp_debug_static_bot_x64': [
+      'ios', 'gyp', 'release_bot', 'x64'
     ],
 
     # Linux, Mac and Windows
     'gyp_crosscompile_release_bot_arm': [
       'gyp', 'crosscompile', 'openh264_release_bot', 'arm'
     ],
     'gyp_debug_bot_x86': [
       'gyp', 'openh264_debug_bot', 'x86'
     ],
     'gyp_release_bot_x86': [
@@ skipping 183 matching lines @@
       'gyp_defines': 'use_goma=1',
     },
 
     'gyp': {'type': 'gyp'},
 
     'ios': {
       'gn_args': 'target_os="ios"',
       'gyp_defines': 'OS=ios',
     },
 
-    'ios_debug_bot': {
-      'mixins': ['debug', 'shared']

[kjellander_webrtc, 2016/08/15 19:00:43]

This doesn't work for the built simulator tests, it needs to be static.

-    },
-
-    'ios_release_bot': {
-      'mixins': ['release', 'static']
-    },
-
     'lsan': {
       'gn_args': 'is_lsan=true',
       'gyp_defines': 'lsan=1',
     },
 
     'memcheck': {
       'gyp_defines': 'build_for_tool=memcheck',
     },
 
     'minimal_symbols': {
@@ skipping 78 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }