[infra] Fix GN args of ios-build-perf-developer
It's failing at gn gen.
https://ci.chromium.org/ui/p/chromium/builders/build/ios-build-perf-developer/1/overview
This CL adds `ios_developer` mixin to avoid adding redundant GN args.
Bug: b/320404386
Change-Id: I327c73275daf43c2db515901877a6647ef4510e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5239887
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Junji Watanabe <jwata@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1252510}
diff --git a/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
index 979998a..5967681 100644
--- a/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
@@ -2,10 +2,7 @@
"phases": {
"ninja": {
"gn_args": {
- "enable_nacl": false,
- "is_component_build": true,
"is_debug": true,
- "symbol_level": 2,
"target_environment": "simulator",
"target_os": "ios",
"use_remoteexec": true,
@@ -14,10 +11,7 @@
},
"siso_native": {
"gn_args": {
- "enable_nacl": false,
- "is_component_build": true,
"is_debug": true,
- "symbol_level": 2,
"target_environment": "simulator",
"target_os": "ios",
"use_siso": true
@@ -25,10 +19,7 @@
},
"siso_reproxy": {
"gn_args": {
- "enable_nacl": false,
- "is_component_build": true,
"is_debug": true,
- "symbol_level": 2,
"target_environment": "simulator",
"target_os": "ios",
"use_remoteexec": true,
diff --git a/infra/config/gn_args/gn_args.star b/infra/config/gn_args/gn_args.star
index bf630396..1e102dd 100644
--- a/infra/config/gn_args/gn_args.star
+++ b/infra/config/gn_args/gn_args.star
@@ -726,6 +726,11 @@
)
gn_args.config(
+ name = "ios_developer",
+ configs = ["ios_simulator", "debug"],
+)
+
+gn_args.config(
name = "ios_device",
args = {"target_environment": "device"},
configs = ["ios"],
diff --git a/infra/config/subprojects/build/build.star b/infra/config/subprojects/build/build.star
index 697e66f8..dbf4fb4 100644
--- a/infra/config/subprojects/build/build.star
+++ b/infra/config/subprojects/build/build.star
@@ -579,9 +579,9 @@
),
),
gn_args = {
- "ninja": gn_args.config(configs = ["ios_simulator", "developer", "reclient", "no_siso"]),
- "siso_reproxy": gn_args.config(configs = ["ios_simulator", "developer", "reclient"]),
- "siso_native": gn_args.config(configs = ["ios_simulator", "developer"]),
+ "ninja": gn_args.config(configs = ["ios_developer", "reclient", "no_siso"]),
+ "siso_reproxy": gn_args.config(configs = ["ios_developer", "reclient"]),
+ "siso_native": gn_args.config(configs = ["ios_developer"]),
},
os = os.MAC_DEFAULT,
cpu = cpu.ARM64,
