Index: tools/mb/mb_config.pyl |
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl |
index e9632c62fe2ecf0fa3cc80b4446a8057ff647161..7fc7b19865736e4947e82372cd35a24c2edb8ef2 100644 |
--- a/tools/mb/mb_config.pyl |
+++ b/tools/mb/mb_config.pyl |
@@ -55,6 +55,8 @@ |
'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. |
@@ -241,6 +243,22 @@ |
'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 us
Dirk Pranke
2015/11/09 21:02:51
Yup, I understand and am very sympathetic. If all
|
+ }, |
+ |
+ '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': { |
@@ -395,6 +413,8 @@ |
'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', |
}, |
@@ -496,6 +516,8 @@ |
'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', |