0

[infra] Remove references to main_builder_rel_mb chromium config

https://crrev.com/c/6405179 removed references to chromium and
chromium_android configs that provided little value because they didn't
do anything except include other configs without introducing a cohesive
concept, but missed removing references to the main_builder_rel_mb
config for the chromium module. This replaces such references to just
use main_builder and mb so that it is safe to remove the
main_builder_rel_mb config.

Bug: 403607431
Change-Id: Ic3c10ab3e63c16cbdffd40cbcd1059d2c6fc1c82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6432707
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Cr-Commit-Position: refs/heads/main@{#1442756}
This commit is contained in:
Garrett Beaty
2025-04-04 10:47:05 -07:00
committed by Chromium LUCI CQ
parent 125f04b6c4
commit 75a5138408
21 changed files with 208 additions and 58 deletions
infra/config
generated
builders
ci
Android FYI Release (NVIDIA Shield TV)
Android FYI Release (Pixel 2)
Android FYI Release (Pixel 4)
Android FYI Release (Samsung A13)
Android FYI Release (Samsung A23)
Dawn Android arm Builder
Dawn Android arm DEPS Builder
Dawn Android arm DEPS Release (Nexus 5X)
Dawn Android arm DEPS Release (Pixel 4)
Dawn Android arm Release (Nexus 5X)
Dawn Android arm Release (Pixel 4)
GPU FYI Android arm Builder
try
android-dawn-arm-rel
dawn-android-arm-deps-rel
gpu-fyi-try-android-a13-32
gpu-fyi-try-android-a23-32
gpu-fyi-try-android-nvidia-shield-tv
gpu-fyi-try-android-p-pixel-2-32
gpu-fyi-try-android-r-pixel-4-32
subprojects

@ -16,8 +16,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -49,8 +52,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -16,8 +16,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -48,8 +51,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -16,8 +16,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -48,8 +51,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -16,8 +16,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -49,8 +52,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -16,8 +16,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -49,8 +52,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -20,8 +20,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -50,8 +53,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -85,8 +91,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -20,8 +20,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -49,8 +52,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -83,8 +89,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -17,8 +17,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -46,8 +49,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -17,8 +17,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -46,8 +49,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -17,8 +17,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -47,8 +50,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -17,8 +17,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -47,8 +50,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -52,8 +55,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -84,8 +90,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -116,8 +125,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -149,8 +161,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -182,8 +197,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -20,8 +20,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -50,8 +53,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -85,8 +91,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -20,8 +20,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -49,8 +52,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -83,8 +89,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -52,8 +55,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -52,8 +55,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -52,8 +55,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -51,8 +54,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -19,8 +19,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"
@ -51,8 +54,11 @@
"config": "base_config"
},
"legacy_chromium_config": {
"apply_configs": [
"mb"
],
"build_config": "Release",
"config": "main_builder_rel_mb",
"config": "main_builder",
"target_arch": "arm",
"target_bits": 32,
"target_platform": "android"

@ -213,7 +213,8 @@ ci.gpu.linux_builder(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -297,7 +298,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -341,7 +343,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -678,7 +681,8 @@ ci.gpu.linux_builder(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -764,7 +768,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -809,7 +814,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,

@ -95,7 +95,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -209,7 +210,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -269,7 +271,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -513,7 +516,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -566,7 +570,8 @@ ci.thin_tester(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,
@ -847,7 +852,8 @@ ci.gpu.linux_builder(
],
),
chromium_config = builder_config.chromium_config(
config = "main_builder_rel_mb",
config = "main_builder",
apply_configs = ["mb"],
build_config = builder_config.build_config.RELEASE,
target_arch = builder_config.target_arch.ARM,
target_bits = 32,