Add LUCI & mb configs for FYI CI and trybot android-nougat-x86-rel
Note that we use src-side builder configs so we don't need a recipe-side
config change.
PS1: Update console view category so that emulator builders can be
grouped in a cleaner way.
PS2: Correct the mb config by removing resource_allowlisting from
certain builders's config name.
Bug: 1303439
Change-Id: I99d21c8a979036f09f53017f3445fd41ea1ab066
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3521102
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#980428}
diff --git a/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json b/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json
new file mode 100644
index 0000000..d62b9eb9
--- /dev/null
+++ b/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json
@@ -0,0 +1,65 @@
+{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "android-nougat-x86-rel",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "builder_group": "chromium.android.fyi",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "x86_builder_mb"
+ },
+ "legacy_chromium_config": {
+ "build_config": "Release",
+ "config": "android",
+ "target_bits": 32,
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "enable_reclient",
+ "enable_wpr_tests"
+ ],
+ "config": "chromium"
+ }
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "android-nougat-x86-rel",
+ "project": "chromium"
+ }
+ ],
+ "mirroring_builder_group_and_names": [
+ {
+ "builder": "android-nougat-x86-rel",
+ "group": "tryserver.chromium.android"
+ }
+ ]
+ }
+ },
+ "$build/reclient": {
+ "instance": "rbe-chromium-trusted",
+ "jobs": 250,
+ "metrics_project": "chromium-reclient-metrics"
+ },
+ "$recipe_engine/resultdb/test_presentation": {
+ "column_keys": [],
+ "grouping_keys": [
+ "status",
+ "v.test_suite"
+ ]
+ },
+ "builder_group": "chromium.android.fyi",
+ "recipe": "chromium"
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json b/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json
new file mode 100644
index 0000000..ac42792
--- /dev/null
+++ b/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json
@@ -0,0 +1,60 @@
+{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "android-nougat-x86-rel",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "builder_group": "chromium.android.fyi",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "x86_builder_mb"
+ },
+ "legacy_chromium_config": {
+ "build_config": "Release",
+ "config": "android",
+ "target_bits": 32,
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "enable_reclient",
+ "enable_wpr_tests"
+ ],
+ "config": "chromium"
+ }
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "android-nougat-x86-rel",
+ "project": "chromium"
+ }
+ ]
+ }
+ },
+ "$build/goma": {
+ "enable_ats": true,
+ "rpc_extra_params": "?prod",
+ "server_host": "goma.chromium.org",
+ "use_luci_auth": true
+ },
+ "$recipe_engine/resultdb/test_presentation": {
+ "column_keys": [],
+ "grouping_keys": [
+ "status",
+ "v.test_suite"
+ ]
+ },
+ "builder_group": "tryserver.chromium.android",
+ "recipe": "chromium_trybot"
+}
\ No newline at end of file
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index 757ed57f..6b8414b2 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -412,6 +412,10 @@
includable_only: true
}
builders {
+ name: "chromium/try/android-nougat-x86-rel"
+ includable_only: true
+ }
+ builders {
name: "chromium/try/android-official"
includable_only: true
}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index d974ff0..36467da 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -25708,6 +25708,85 @@
}
}
builders {
+ name: "android-nougat-x86-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-18.04"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/chromium/bootstrapper/${platform}"
+ cipd_version: "latest"
+ cmd: "bootstrapper"
+ }
+ properties:
+ '{'
+ ' "$bootstrap/exe": {'
+ ' "exe": {'
+ ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+ ' "cipd_version": "refs/heads/main",'
+ ' "cmd": ['
+ ' "luciexe"'
+ ' ]'
+ ' }'
+ ' },'
+ ' "$bootstrap/properties": {'
+ ' "properties_file": "infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "chromium.android.fyi",'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium"'
+ '}'
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+ }
+ }
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "blink_web_tests_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ }
+ builders {
name: "android-official"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builder:android-official"
@@ -49940,6 +50019,96 @@
}
}
builders {
+ name: "android-nougat-x86-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-18.04"
+ dimensions: "pool:luci.chromium.try"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/chromium/bootstrapper/${platform}"
+ cipd_version: "latest"
+ cmd: "bootstrapper"
+ }
+ properties:
+ '{'
+ ' "$bootstrap/exe": {'
+ ' "exe": {'
+ ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+ ' "cipd_version": "refs/heads/main",'
+ ' "cmd": ['
+ ' "luciexe"'
+ ' ]'
+ ' }'
+ ' },'
+ ' "$bootstrap/properties": {'
+ ' "properties_file": "infra/config/generated/builders/try/android-nougat-x86-rel/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "tryserver.chromium.android",'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium_trybot"'
+ '}'
+ execution_timeout_secs: 14400
+ expiration_secs: 7200
+ grace_period {
+ seconds: 120
+ }
+ caches {
+ name: "win_toolchain"
+ path: "win_toolchain"
+ }
+ build_numbers: YES
+ service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {
+ value: 5
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "try_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "gpu_try_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+ }
+ }
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "blink_web_tests_try_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ }
+ builders {
name: "android-official"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 541021b..468ae880 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -3710,19 +3710,24 @@
short_name: "m"
}
builders {
- name: "buildbucket/luci.chromium.ci/android-11-x86-fyi-rel"
- category: "emulator|11|x86"
- short_name: "rel"
+ name: "buildbucket/luci.chromium.ci/android-12-x64-fyi-rel"
+ category: "emulator|x64|rel"
+ short_name: "12"
}
builders {
- name: "buildbucket/luci.chromium.ci/android-12-x64-fyi-rel"
- category: "emulator|12|x64"
- short_name: "rel"
+ name: "buildbucket/luci.chromium.ci/android-11-x86-fyi-rel"
+ category: "emulator|x86|rel"
+ short_name: "11"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/android-nougat-x86-rel"
+ category: "emulator|x86|rel"
+ short_name: "N"
}
builders {
name: "buildbucket/luci.chromium.ci/android-pie-x86-fyi-rel"
- category: "emulator|P|x86"
- short_name: "rel"
+ category: "emulator|x86|rel"
+ short_name: "P"
}
builders {
name: "buildbucket/luci.chromium.ci/android-annotator-rel"
@@ -14563,6 +14568,9 @@
name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel-non-cq"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-nougat-x86-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/android-official"
}
builders {
@@ -15677,6 +15685,9 @@
name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel-non-cq"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-nougat-x86-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/android-opus-arm-rel"
}
builders {
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index d43096f..81c115d 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -4498,6 +4498,16 @@
}
}
job {
+ id: "android-nougat-x86-rel"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "android-nougat-x86-rel"
+ }
+}
+job {
id: "android-official"
realm: "ci"
acl_sets: "ci"
@@ -7238,6 +7248,7 @@
triggers: "android-marshmallow-arm64-rel"
triggers: "android-marshmallow-x86-rel"
triggers: "android-marshmallow-x86-rel-non-cq"
+ triggers: "android-nougat-x86-rel"
triggers: "android-official"
triggers: "android-pie-arm64-coverage-experimental-rel"
triggers: "android-pie-arm64-rel"
diff --git a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
index 6267311..6862ff9 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
@@ -127,13 +127,40 @@
reclient_instance = rbe_instance.DEFAULT,
)
+ci.builder(
+ name = "android-nougat-x86-rel",
+ builder_spec = builder_config.builder_spec(
+ gclient_config = builder_config.gclient_config(
+ config = "chromium",
+ apply_configs = ["android", "enable_reclient", "enable_wpr_tests"],
+ ),
+ chromium_config = builder_config.chromium_config(
+ config = "android",
+ build_config = builder_config.build_config.RELEASE,
+ target_bits = 32,
+ target_platform = builder_config.target_platform.ANDROID,
+ ),
+ android_config = builder_config.android_config(
+ config = "x86_builder_mb",
+ ),
+ execution_mode = builder_config.execution_mode.COMPILE_AND_TEST,
+ ),
+ console_view_entry = consoles.console_view_entry(
+ category = "emulator|x86|rel",
+ short_name = "N",
+ ),
+ goma_backend = None,
+ reclient_instance = rbe_instance.DEFAULT,
+ reclient_jobs = rbe_jobs.DEFAULT,
+)
+
# TODO(crbug.com/1022533#c40): Remove this builder once there are no associated
# disabled tests.
ci.builder(
name = "android-pie-x86-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "emulator|P|x86",
- short_name = "rel",
+ category = "emulator|x86|rel",
+ short_name = "P",
),
goma_jobs = goma.jobs.J150,
# Set to an empty list to avoid chromium-gitiles-trigger triggering new
@@ -156,8 +183,8 @@
ci.builder(
name = "android-11-x86-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "emulator|11|x86",
- short_name = "rel",
+ category = "emulator|x86|rel",
+ short_name = "11",
),
# Set to an empty list to avoid chromium-gitiles-trigger triggering new
# builds. Also we don't set any `schedule` since this builder is for
@@ -168,8 +195,8 @@
ci.builder(
name = "android-12-x64-fyi-rel",
console_view_entry = consoles.console_view_entry(
- category = "emulator|12|x64",
- short_name = "rel",
+ category = "emulator|x64|rel",
+ short_name = "12",
),
# Set to an empty list to avoid chromium-gitiles-trigger triggering new
# builds. Also we don't set any `schedule` since this builder is for
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
index d5ae648..5b65d56 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
@@ -231,6 +231,11 @@
)
try_.builder(
+ name = "android-nougat-x86-rel",
+ mirrors = ["ci/android-nougat-x86-rel"],
+)
+
+try_.builder(
name = "android-opus-arm-rel",
)
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 75e1f21..7943d90b 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -101,8 +101,8 @@
# on the chromium.gpu waterfall, which it mirrors via trybots.pyl.
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild_reclient',
- 'android-marshmallow-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_allowlisting_webview_google_reclient',
- 'android-marshmallow-x86-rel-non-cq': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_allowlisting_webview_google_reclient',
+ 'android-marshmallow-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_reclient',
+ 'android-marshmallow-x86-rel-non-cq': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_reclient',
# TODO(crbug/1182468) Remove android coverage bots after coverage is
# running on CQ.
'android-pie-arm64-coverage-experimental-rel': 'android_release_bot_arm64_webview_monochrome_expectations_reclient',
@@ -124,6 +124,7 @@
'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_monochrome_reclient',
'android-chrome-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_reclient',
'android-cronet-asan-x86-rel': 'android_cronet_release_bot_minimal_symbols_x86_clang_asan_reclient',
+ 'android-nougat-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_reclient',
'android-weblayer-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_reclient',
'android-weblayer-pie-x86-wpt-smoketest': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_reclient',
'android-webview-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_monochrome_webview_shell_reclient',
@@ -832,9 +833,10 @@
'android-cronet-x86-dbg-oreo-tests': 'android_cronet_debug_static_bot_x86',
'android-cronet-x86-dbg-pie-tests': 'android_cronet_debug_static_bot_x86',
'android-inverse-fieldtrials-pie-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google_invert_fieldtrials',
- 'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_allowlisting_fastbuild_java_coverage',
- 'android-marshmallow-x86-rel': 'android_release_trybot_x86_fastbuild_resource_allowlisting_webview_google_coverage',
- 'android-marshmallow-x86-rel-non-cq': 'android_release_trybot_x86_fastbuild_resource_allowlisting_webview_google',
+ 'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_fastbuild_java_coverage',
+ 'android-marshmallow-x86-rel': 'android_release_trybot_x86_fastbuild_webview_google_coverage',
+ 'android-marshmallow-x86-rel-non-cq': 'android_release_trybot_x86_fastbuild_webview_google',
+ 'android-nougat-x86-rel': 'android_release_trybot_x86_fastbuild_webview_monochrome',
'android-oreo-arm64-cts-networkservice-dbg': 'android_debug_trybot_arm64',
# TODO(crbug/1182468) Remove android coverage bots after coverage is
# running on CQ.
@@ -844,8 +846,8 @@
'android-pie-arm64-wpt-rel-non-cq': 'android_release_trybot_arm64_webview_monochrome',
'android-pie-x86-rel': 'android_release_trybot_x86_fastbuild_webview_monochrome',
'android-chrome-pie-x86-wpt-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_monochrome',
- 'android-weblayer-10-x86-rel-tests': 'android_release_trybot_minimal_symbols_x86_fastbuild_resource_allowlisting_disable_proguard_chrome_google',
- 'android-weblayer-marshmallow-x86-rel-tests': 'android_release_trybot_minimal_symbols_x86_fastbuild_resource_allowlisting_disable_proguard_chrome_google',
+ 'android-weblayer-10-x86-rel-tests': 'android_release_trybot_minimal_symbols_x86_fastbuild_disable_proguard_chrome_google',
+ 'android-weblayer-marshmallow-x86-rel-tests': 'android_release_trybot_minimal_symbols_x86_fastbuild_disable_proguard_chrome_google',
'android-weblayer-pie-x86-rel-tests': 'android_release_trybot_minimal_symbols_x86_fastbuild_disable_proguard_webview_monochrome',
'android-weblayer-pie-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_monochrome',
'android-weblayer-pie-x86-wpt-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_monochrome',
@@ -1552,7 +1554,7 @@
'chrome_google'
],
- 'android_release_bot_minimal_symbols_x86_fastbuild_resource_allowlisting_webview_google_reclient': [
+ 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_reclient': [
'android', 'release_bot_reclient', 'minimal_symbols', 'x86',
'android_fastbuild', 'strip_debug_info', 'webview_google',
],
@@ -1629,7 +1631,7 @@
'disable_proguard'
],
- 'android_release_trybot_minimal_symbols_x86_fastbuild_resource_allowlisting_disable_proguard_chrome_google': [
+ 'android_release_trybot_minimal_symbols_x86_fastbuild_disable_proguard_chrome_google': [
'android', 'release_trybot', 'minimal_symbols',
'android_fastbuild', 'x86', 'strip_debug_info', 'disable_proguard',
'chrome_google'
@@ -1641,12 +1643,12 @@
'no_secondary_abi',
],
- 'android_release_trybot_x86_fastbuild_resource_allowlisting_webview_google': [
+ 'android_release_trybot_x86_fastbuild_webview_google': [
'android', 'release_trybot', 'x86', 'android_fastbuild',
'strip_debug_info', 'webview_google',
],
- 'android_release_trybot_x86_fastbuild_resource_allowlisting_webview_google_coverage': [
+ 'android_release_trybot_x86_fastbuild_webview_google_coverage': [
'android', 'release_trybot', 'x86', 'android_fastbuild',
'strip_debug_info', 'webview_google', 'use_java_coverage',
'partial_code_coverage_instrumentation',
@@ -2426,7 +2428,7 @@
'android_fastbuild',
],
- 'gpu_tests_android_release_trybot_arm64_resource_allowlisting_fastbuild_java_coverage': [
+ 'gpu_tests_android_release_trybot_arm64_fastbuild_java_coverage': [
'gpu_tests', 'android', 'release_trybot', 'arm64', 'static_angle',
'strip_debug_info', 'android_fastbuild', 'webview_google',
'use_java_coverage', 'partial_code_coverage_instrumentation',
diff --git a/tools/mb/mb_config_expectations/chromium.android.fyi.json b/tools/mb/mb_config_expectations/chromium.android.fyi.json
index d3d9069..68ad404 100644
--- a/tools/mb/mb_config_expectations/chromium.android.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.android.fyi.json
@@ -109,6 +109,24 @@
"use_thin_lto": false
}
},
+ "android-nougat-x86-rel": {
+ "gn_args": {
+ "dcheck_always_on": false,
+ "disable_android_lint": true,
+ "ffmpeg_branding": "Chrome",
+ "is_component_build": false,
+ "is_debug": false,
+ "proprietary_codecs": true,
+ "strip_debug_info": true,
+ "symbol_level": 1,
+ "system_webview_package_name": "com.google.android.apps.chrome",
+ "target_cpu": "x86",
+ "target_os": "android",
+ "use_errorprone_java_compiler": false,
+ "use_rbe": true,
+ "use_remoteexec": true
+ }
+ },
"android-pie-arm64-wpt-rel-non-cq": {
"gn_args": {
"dcheck_always_on": false,
diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.android.json b/tools/mb/mb_config_expectations/tryserver.chromium.android.json
index 1aadda8..1a42ada1 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.android.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.android.json
@@ -605,6 +605,24 @@
"use_goma": true
}
},
+ "android-nougat-x86-rel": {
+ "gn_args": {
+ "blink_enable_generated_code_formatting": false,
+ "dcheck_always_on": true,
+ "disable_android_lint": true,
+ "ffmpeg_branding": "Chrome",
+ "is_component_build": false,
+ "is_debug": false,
+ "proprietary_codecs": true,
+ "strip_debug_info": true,
+ "symbol_level": 0,
+ "system_webview_package_name": "com.google.android.apps.chrome",
+ "target_cpu": "x86",
+ "target_os": "android",
+ "use_errorprone_java_compiler": false,
+ "use_goma": true
+ }
+ },
"android-opus-arm-rel": {
"gn_args": {
"blink_enable_generated_code_formatting": false,