Make MB aware of iOS bot configs and get iOS working.

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # 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).
@@ skipping 37 matching lines @@
     'gyp_official_goma': ['gyp', 'official', 'goma'],
     'gyp_official_goma_chromeos': ['gyp', 'official', 'goma', 'chromeos'],
     'gyp_official_goma_x86': ['gyp', 'official', 'goma', 'x86'],
     'gyp_official_goma_minimal_symbols_android': ['gyp', 'official', 'goma', 'minimal_symbols', 'android'],
     'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'],
     'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'],
     'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'],
     'gyp_release_bot_arm': ['gyp', 'release_bot', 'arm', 'crosscompile'],
     'gyp_release_trybot': ['gyp', 'release_trybot'],
     'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'],
+    'ios_device_gn_release': ['ios_device', 'gn', 'static', 'release'],
+    'ios_simulator_gn_debug': ['ios_simulator', 'gn', 'static', 'debug'],
     'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan'],
 
     # This is just for completeness; any bot that uses this config should never actually run MB.
     'none': ['none'],
 
     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
     'noswarming_gyp_release_bot_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'linux_dump_symbols'],
     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
     'noswarming_gyp_release_bot_x86_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'x86', 'linux_dump_symbols'],
 
@@ skipping 166 matching lines @@
       'gyp_defines': 'use_goma=1 gomadir=$(goma_dir)',
     },
 
     'gpu_tests': {
       'gn_args': '', # not needed in GN builds.
       'gyp_defines': 'archive_gpu_tests=1',
     },
 
     'gyp': {'type': 'gyp'},
 
+    'ios_device': {
+      # TODO(GYP): Figure out the GN equivalents for target_subarch and
+      # we'll eventually also probably need to move chromium_ios_signing into
+      # a separate mixin.
+      'gn_args': 'target_os="ios" target_cpu="arm" ios_enable_code_signing=false',
+      'gyp_defines': 'OS=ios target_subarch=both chromium_ios_signing=0'

[smut, 2015/11/09 20:48:04]

For iOS we've gone to a lot of trouble to allow user-defined gyp_defines in the
bot config files themselves. Here we can only assume OS=ios.

I would really prefer it if somehow target_subarch and chromium_ios_signing
could get their values from the config files for the bots themselves. The .json
files you added to this CL already specify values for these two gyp_defines, and
it would be confusing if they were just ignored and these values were used
instead.

It's also not just these two, but arbitrary gyp_defines that need to continue to
be supported in the .json config files. Downstream we use a lot more than just
target_subarch and chromium_ios_signing, and they are supported in a unified way
for xcodebuild and gyp+ninja. It would be better if mb/gn+ninja conformed.

[Dirk Pranke, 2015/11/09 21:02:51]

Yup, I understand and am very sympathetic. If all of the bots had done what you
did, I arguably wouldn't have needed to write MB at all all (or at least, I
would've needed it to do much less).

But, unfortunately, none of the other bots can be configured via src-side config
files.

And, it's much more important to me that we have one mechanism for configuring
what GYP_DEFINES and GN args we use. We will need to update the downstream bots
to use MB as well, and we will need to update MB to support xcodebuild unless we
kill off xcodebuild instead.

Ideally we would delete the GYP_DEFINES and the configuration info for ninja vs.
xcode altogether. I think in order to do that we would need to ensure that there
are no gclient hooks that look at GYP defines, and we'd need to see if we can
make your recipes look at the output from MB instead of the config file directly
if the recipe needs to do something different based on xcodebuild vs. ninja.

+    },
+
+    'ios_simulator': {
+      # TODO(GYP): Figure out the GN equivalents for target_subarch and
+      # we'll eventually also probably need to move chromium_ios_signing into
+      # a separate mixin.
+      'gn_args': 'target_os="ios" use_ios_simulator=true',
+      'gyp_defines': 'OS=ios target_subarch=both chromium_ios_signing=0',
+    },
+
     'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
 
     'linux_dump_symbols': {
       'gn_args': 'error', # TODO(GYP): Port linux_dump_symbols?
       'gyp_defines': 'linux_dump_symbols=1',
     },
 
     'lsan': {
       'gn_args': 'use_lsan=true',
       'gyp_defines': 'lsan=1',
@@ skipping 134 matching lines @@
       'Android Builder (dbg)': 'android_gyp_debug_static_bot',
       'Android Tests (dbg)': 'android_gyp_debug_static_bot',
       'Android Builder': 'android_gyp_release_bot',
       'Android Tests': 'android_gyp_release_bot',
       'Android Clang Builder (dbg)': 'android_clang_asan_gyp_debug_bot',
       'Android GN': 'android_gn_release_bot',
       'Android GN (dbg)': 'android_gn_debug_bot',
       'Cast Android (dbg)': 'android_cast_gyp_debug_static_bot',
     },
     'chromium.mac': {
+      'iOS Device GN': 'ios_device_gn_release',
+      'iOS Simulator GN (dbg)': 'ios_simulator_gn_debug',
       'Mac GN': 'gn_release_bot',
       'Mac GN (dbg)': 'gn_debug_static_bot',
     },
     'chromium.mojo': {
       'Chromium Mojo Android': 'android_gn_release_bot',
       'Chromium Mojo Linux Perf': 'gn_release_bot',
       'Chromium Mojo Android Nexus5 Perf': 'android_gn_release_bot',
       'Chromium Mojo Windows': 'gn_release_bot_minimal_symbols_x86',
       'Chromium Mojo Linux': 'gn_release_bot',
       'Chromium Mojo Windows 7 Perf': 'gn_release_bot_minimal_symbols_x86',
@@ skipping 81 matching lines @@
       'linux_arm_tester': 'none',
       'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_clobber_rel_ng': 'gyp_release_trybot',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'cast_shell_linux': 'cast_gyp_release_trybot',
       'linux_deterministic': 'swarming_deterministic_gyp_release_bot',
       'linux_ecs_ozone': 'embedded_gyp_debug_bot',
     },
     'tryserver.chromium.mac': {
+      'ios_dbg_simulator_gn': 'ios_simulator_gn_debug',
+      'ios_rel_device_gn': 'ios_device_gn_release',
       'mac_chromium_gn_dbg': 'gn_debug_static_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
     },
     'tryserver.chromium.perf': {
       'android_perf_bisect_builder': 'gyp_official_goma_minimal_symbols_android',
       'android_arm64_perf_bisect_builder': 'gyp_official_goma_minimal_symbols_android_arm64',
       'linux_perf_bisect_builder': 'gyp_official_goma',
       'mac_perf_bisect_builder': 'gyp_official_goma',
       'win_perf_bisect_builder': 'gyp_official_goma_minimal_symbols_x86',
@@ skipping 25 matching lines @@
       'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
     },
   },
 }