[ios] Set `target_environment` gn variable on bots

In preparation of supporting arm64 simulator build (for Apple Silicon
macs), we need to decouple the fact that a build is a simulator build
from the `target_cpu`.

This was done by introducing a `target_environment` variable that can
be set by the user (the default value is set using the same heuristic
based on value of `target_cpu` if unset).

Configure the bots to be explicit about setting the variable.

Bug: 1138425
Change-Id: Idb54c71bdb979469adc4b2dc6d7a78ef184d57c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489645
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819464}

tools/mb/mb_config.pyl

@@ -2040,45 +2040,44 @@
     'ios_error': [ 'error'],
 
     'ios_clang_tot_xctest': [
-      'clang_tot', 'ios_simulator', 'ios_disable_code_signing', 'release', 'static', 'xctest',
+      'clang_tot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_disable_code_signing', 'release', 'static', 'xctest',
     ],
 
     'ios_clang_device_tot_xctest': [
-      'clang_tot', 'ios_device', 'release', 'ios_chromium_cert', 'xctest',
+      'clang_tot', 'ios', 'ios_device', 'ios_cpu_arm64', 'release', 'ios_chromium_cert', 'xctest',
     ],
 
     'ios_cronet_xctest': [
-      'additional_target_cpus_x86', 'cronet_ios', 'debug_static_bot',
-      'ios_deployment_target_10_0', 'ios_simulator', 'xctest',
+      'additional_target_cpus_x86', 'cronet_ios', 'debug_static_bot', 'ios_deployment_target_10_0', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],
 
     'ios_device_release_compile_only': [
-        'compile_only', 'ios_device', 'ios_google_cert', 'ios_disable_code_signing', 'release_bot'
+        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'release_bot'
     ],
 
     'ios_device_release_rbe_compile_only': [
-        'compile_only', 'ios_device', 'ios_google_cert', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot'
+        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot'
     ],
 
     # doesn't have symbol_level=0
     'ios_device_release_static_rbe_bot_xctest': [
-        'ios_device', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot', 'xctest',
+        'ios', 'ios_device', 'ios_cpu_arm64', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot', 'xctest',
     ],
 
     'ios_simulator_debug_static_bot_xctest': [
-        'debug_static_bot', 'ios_simulator', 'xctest',
+        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],
 
     'ios_simulator_debug_static_bot_multi_window_xctest': [
-        'debug_static_bot', 'ios_enable_multi_window', 'ios_simulator', 'xctest',
+        'debug_static_bot', 'ios_enable_multi_window', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
     ],
 
     'ios_simulator_debug_static_rbe_bot_xctest': [
-        'debug_static_bot', 'ios_simulator', 'ios_use_goma_rbe', 'xctest',
+        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_use_goma_rbe', 'xctest',
     ],
 
     'ios_simulator_release_static_asan_bot_xctest': [
-        'ios_simulator', 'release_bot', 'asan', 'xctest',
+        'ios', 'ios_simulator', 'ios_cpu_x64', 'release_bot', 'asan', 'xctest',
     ],
 
     'lacros_on_linux_release_bot': [
@@ -2837,11 +2836,22 @@
       'gn_args': 'ios_deployment_target=\"10.0\"',
     },
 
-    'ios_device': {
-      'mixins': ['ios'],
+    'ios_cpu_x64': {
+      'gn_args': 'target_cpu="x64"',
+    },
+
+    'ios_cpu_arm64': {
       'gn_args': 'target_cpu="arm64"',
     },
 
+    'ios_device': {
+      'gn_args': 'target_environment="device"',
+    },
+
+    'ios_simulator': {
+      'gn_args': 'target_environment="simulator"',
+    },
+
     'ios_disable_code_signing': {
       # defaults to true under ios_sdk.gni
       'gn_args': 'ios_enable_code_signing=false'
@@ -2851,11 +2861,6 @@
       'gn_args': 'ios_enable_multi_window=true'
     },
 
-    'ios_simulator': {
-      'mixins': ['ios'],
-      'gn_args': 'target_cpu="x64"',
-    },
-
     'ios_use_goma_rbe': {
       'gn_args': 'ios_use_goma_rbe=true'
     },

tools/mb/mb_config_expectations/chromium.clang.json

@@ -410,6 +410,7 @@
       "is_debug": false,
       "llvm_force_head_revision": true,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios"
     }
   },
@@ -421,6 +422,7 @@
       "is_debug": false,
       "llvm_force_head_revision": true,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios"
     }
   },

tools/mb/mb_config_expectations/chromium.fyi.json

@@ -354,6 +354,7 @@
       "is_component_build": false,
       "is_debug": false,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -378,6 +379,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -400,6 +402,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_allocator_shim": false,
       "use_crash_key_stubs": true,
@@ -415,6 +418,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -427,6 +431,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -438,6 +443,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -450,6 +456,7 @@
       "is_component_build": false,
       "is_debug": false,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -462,6 +469,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -473,6 +481,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -485,6 +494,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }

tools/mb/mb_config_expectations/chromium.goma.fyi.json

@@ -319,6 +319,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -331,6 +332,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -344,6 +346,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -357,6 +360,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }

tools/mb/mb_config_expectations/chromium.goma.json

@@ -157,6 +157,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }

tools/mb/mb_config_expectations/chromium.mac.json

@@ -29,6 +29,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -41,6 +42,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -52,6 +54,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -64,6 +67,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }

tools/mb/mb_config_expectations/tryserver.chromium.mac.json

@@ -216,6 +216,7 @@
       "is_debug": false,
       "symbol_level": 0,
       "target_cpu": "arm64",
+      "target_environment": "device",
       "target_os": "ios",
       "use_goma": true
     }
@@ -228,6 +229,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -253,6 +255,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -275,6 +278,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_allocator_shim": false,
       "use_crash_key_stubs": true,
@@ -289,6 +293,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -301,6 +306,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -313,6 +319,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -325,6 +332,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -337,6 +345,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -349,6 +358,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }
@@ -361,6 +371,7 @@
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_goma": true
     }