Disable enable_chrome_android_internal on no_secondary_abi android bots
"enable_chrome_android_internal" defaults to true when running in a checkout that has src-internal checked out. On chromium bots, it always defaults to false since nothing in project=chromium checks out src-internal (WAI). However, that's not necessarily the case if someone were to try to repro a chromium bot's args in their chrome checkout. And in such a case, when skip_secondary_abi_for_cq is true, the build fails due to https://crbug.com/361540497. So this explicitly sets enable_chrome_android_internal to false for all chromium bots that enable skip_secondary_abi_for_cq. This should be a no-op for the bots since it's already false for them. But it should let devs re-run the builds locally. Bug: 361560782, 361540497 Change-Id: Ibd983e6b3d4503c69da95829d637a0d3143cb661 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5807321 Commit-Queue: Ben Pastene <bpastene@chromium.org> Reviewed-by: Haiyang Pan <hypan@google.com> Cr-Commit-Position: refs/heads/main@{#1345612}
This commit is contained in:
Ben Pastene
Chromium LUCI CQ
parent
3582bb1a76
commit
91e2dd0507
infra/config
generated/builders
build
ci
android-12-x64-rel
android-13-x64-fyi-rel
android-13-x64-rel
android-14-x64-rel
android-15-x64-fyi-rel
android-15-x64-rel
android-chrome-13-x64-wpt-android-specific
android-fieldtrial-rel
android-webview-13-x64-hostside-rel
android-webview-13-x64-wpt-android-specific
try
android-12-x64-rel
android-13-x64-rel
android-14-x64-rel
android-15-x64-fyi-rel
android-15-x64-rel
android-arm64-rel
android-chrome-13-x64-wpt-android-specific
android-fieldtrial-rel
android-webview-13-x64-hostside-rel
android-webview-13-x64-wpt-android-specific
android-x64-rel
gn_args
@ -4,6 +4,7 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
@ -30,6 +31,7 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_chrome_android_internal": false,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -966,6 +966,11 @@ gn_args.config(
|
||||
name = "no_secondary_abi",
|
||||
args = {
|
||||
"skip_secondary_abi_for_cq": True,
|
||||
# A chromium build with "skip_secondary_abi_for_cq" enabled in a
|
||||
# checkout that has src-internal fails if enable_chrome_android_internal
|
||||
# is not set to false.
|
||||
# TODO(crbug.com/361540497): Can remove this when the build is fixed.
|
||||
"enable_chrome_android_internal": False,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user