Revert "Android: Disable secondary ABIs by default"
This reverts commit 407d0b9377.
Reason for revert: Suspected of causing build breakage
Bug:403251140
Original change's description:
> Android: Disable secondary ABIs by default
>
> For 64-bit target_cpu, we have APK targets for webview that build and
> package 32-bit counterparts. This secondary toolchain slows down "gn
> gen", and goes unused by most developers.
>
> We already had a GN arg to disable the secondary toolchain to make CQ
> bots go faster: "skip_secondary_abi_for_cq". We'd like things to be fast
> by default for developer builds as well, so are changing this flag to be
> "enable_android_secondary_abi", and having it false by default.
>
> So as to not lose coverage, this enables the flag for
> android_compile_dbg (which builds all targets), and for CI/CQ bots where
> it is required. It also enables it when "is_official_build=true" is set.
>
> This makes "gn gen" go from 22s -> 16s on my machine, and siso's "load
> build.ninja" step go from 2s -> 1.5s.
>
> Adds a warning when installing webview via wrapper scripts if the device
> supports more ABIs than webview apk does.
>
> Bug: 391382988
> Change-Id: Ic673a376e79956458aafa0358f5aff0f7e7ab681
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6285709
> Reviewed-by: Haiyang Pan <hypan@google.com>
> Reviewed-by: Nate Fischer <ntfschr@chromium.org>
> Reviewed-by: Richard (Torne) Coles <torne@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1432149}
Bug: 391382988
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I71d51219ef098f866a6bd42ba8775ffec01c07c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6352658
Auto-Submit: Salvador Guerrero Ramos <salg@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Salvador Guerrero Ramos <salg@google.com>
Owners-Override: Salvador Guerrero Ramos <salg@google.com>
Cr-Commit-Position: refs/heads/main@{#1432177}
This commit is contained in:
Salvador Guerrero Ramos
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
191b75f691
commit
455cc52eb9
android_webview
build
infra/config
generated
builders
build
ci
Android arm64 Builder All Targets (dbg)
Android x64 Builder (dbg)
Android x64 Builder All Targets (dbg)
android-10-arm64-rel
android-12-x64-rel
android-12l-x64-rel-cq
android-13-x64-fyi-rel
android-13-x64-rel
android-14-x64-fyi-rel
android-14-x64-rel
android-15-tablet-landscape-x64-rel
android-15-tablet-x64-rel
android-15-x64-fyi-rel
android-15-x64-rel
android-16-x64-fyi-rel
android-arm64-proguard-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-10-arm64-rel
android-12-x64-dbg
android-12-x64-rel
android-12l-landscape-x64-dbg
android-12l-x64-dbg
android-12l-x64-rel-cq
android-13-x64-fyi-rel
android-13-x64-rel
android-14-x64-fyi-rel
android-14-x64-rel
android-15-tablet-landscape-x64-dbg
android-15-tablet-landscape-x64-rel
android-15-tablet-x64-dbg
android-15-tablet-x64-rel
android-15-x64-fyi-rel
android-15-x64-rel
android-16-x64-fyi-rel
android-arm64-all-targets-dbg
android-arm64-rel
android-chrome-13-x64-wpt-android-specific
android-fieldtrial-rel
android-webview-12-x64-dbg
android-webview-13-x64-dbg
android-webview-13-x64-hostside-rel
android-webview-13-x64-wpt-android-specific
android-webview-oreo-arm64-dbg
android-webview-pie-arm64-dbg
android-x64-rel
android_compile_dbg
gn_args
subprojects
@ -76,8 +76,8 @@ template("system_webview_apk_or_module_tmpl") {
|
||||
"manifest_package=$_manifest_package",
|
||||
]
|
||||
if (_is_trichrome) {
|
||||
variables +=
|
||||
trichrome_jinja_variables + [ "trichrome_version=$_version_code" ]
|
||||
variables += trichrome_jinja_variables +
|
||||
[ "trichrome_version=$_version_code" ]
|
||||
if (_is_64_bit_browser) {
|
||||
variables += [ "library=libmonochrome_64.so" ]
|
||||
} else {
|
||||
@ -195,25 +195,21 @@ template("system_webview_apk_or_module_tmpl") {
|
||||
# architecture.
|
||||
if (android_64bit_target_cpu) {
|
||||
if (_is_64_bit_browser) {
|
||||
native_lib_placeholders = [ "libplaceholder.so" ]
|
||||
if (_include_32_bit_webview) {
|
||||
secondary_abi_shared_libraries = [ "//android_webview:monochrome_64($android_secondary_abi_toolchain)" ]
|
||||
_include_secondary_support = true
|
||||
}
|
||||
assert(_include_64_bit_webview)
|
||||
native_lib_placeholders = [ "libplaceholder.so" ]
|
||||
} else {
|
||||
if (_include_64_bit_webview) {
|
||||
shared_libraries = [ "//android_webview:monochrome" ]
|
||||
_include_primary_support = true
|
||||
} else {
|
||||
# trichrome_webview_32_bundle
|
||||
static_library_provider_use_secondary_abi = true
|
||||
}
|
||||
assert(_include_32_bit_webview)
|
||||
secondary_native_lib_placeholders = [ "libplaceholder.so" ]
|
||||
}
|
||||
} else {
|
||||
assert(_include_32_bit_webview)
|
||||
native_lib_placeholders = [ "libplaceholder.so" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -1373,12 +1373,7 @@ class _Command:
|
||||
logging.debug('Device supports (filtered): %r', device_abis)
|
||||
|
||||
if any(abi in app_abis for abi in device_abis):
|
||||
if is_webview and not all(abi in app_abis for abi in device_abis):
|
||||
logging.warning(
|
||||
'Using a webview that supports only %s on a device that '
|
||||
'supports %s. You probably need to set GN arg:\n\n'
|
||||
' enable_android_secondary_abi=true\n', ','.join(app_abis),
|
||||
','.join(device_abis))
|
||||
fully_supported.append(device)
|
||||
else: # No common supported ABIs between the device and app.
|
||||
if device_primary_abi == 'x86':
|
||||
target_cpu = 'x86'
|
||||
|
||||
@ -26,11 +26,10 @@ declare_args() {
|
||||
# Build additional browser splits with HWASAN instrumentation enabled.
|
||||
build_hwasan_splits = false
|
||||
|
||||
# Enable (webview) APKs that support multiple architectures. Generally
|
||||
# needed only for release builds or for webview testing. Slows down "gn gen"
|
||||
# and ninja parse time due to having to write rules for most native targets
|
||||
# a second time. Applicable only when target_cpu is 64-bit.
|
||||
enable_android_secondary_abi = is_official_build
|
||||
# This configuration has minimal coverage.
|
||||
# Forces all APKs/bundles to be 64-bit only to improve build speed
|
||||
# (no need to also build 32-bit library).
|
||||
skip_secondary_abi_for_cq = false
|
||||
}
|
||||
|
||||
assert(!devtools_instrumentation_dumping || use_order_profiling,
|
||||
@ -93,7 +92,7 @@ android_64bit_current_cpu =
|
||||
# target_cpu's that are 32-bit-only or 64-bit-only, as they are not used. The
|
||||
# presence of this variable may be used in conjunction with android_64bit_target_cpu
|
||||
# to identify target_cpu's that are 32-bit-only or 64-bit-only.
|
||||
if (enable_android_secondary_abi) {
|
||||
if (!skip_secondary_abi_for_cq) {
|
||||
if (target_cpu == "arm64") {
|
||||
android_secondary_abi_cpu = "arm"
|
||||
android_app_secondary_abi = "armeabi-v7a"
|
||||
|
||||
@ -4,12 +4,13 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.apps.chrome",
|
||||
|
||||
@ -6,12 +6,13 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.apps.chrome",
|
||||
@ -29,12 +30,13 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.apps.chrome",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": true,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": true,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
"gn_args": {
|
||||
"dcheck_always_on": false,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 1,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
"android_static_analysis": "off",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
"gn_args": {
|
||||
"android_static_analysis": "off",
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -4,12 +4,13 @@
|
||||
"coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"enable_chrome_android_internal": false,
|
||||
"fail_on_android_expectations": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.apps.chrome",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"target_cpu": "x64",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
"gn_args": {
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
"gn_args": {
|
||||
"dcheck_always_on": true,
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": false,
|
||||
"is_debug": false,
|
||||
|
||||
@ -4,10 +4,12 @@
|
||||
"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,
|
||||
"proprietary_codecs": true,
|
||||
"skip_secondary_abi_for_cq": true,
|
||||
"strip_debug_info": true,
|
||||
"symbol_level": 0,
|
||||
"system_webview_package_name": "com.google.android.webview.debug",
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"gn_args": {
|
||||
"debuggable_apks": false,
|
||||
"enable_android_secondary_abi": true,
|
||||
"ffmpeg_branding": "Chrome",
|
||||
"is_component_build": true,
|
||||
"is_debug": true,
|
||||
|
||||
@ -564,13 +564,6 @@ gn_args.config(
|
||||
],
|
||||
)
|
||||
|
||||
gn_args.config(
|
||||
name = "enable_android_secondary_abi",
|
||||
args = {
|
||||
"enable_android_secondary_abi": True,
|
||||
},
|
||||
)
|
||||
|
||||
# Enables backup ref ptr by changing the default value of the feature flag.
|
||||
# This sets the default value of PartitionAllocBackupRefPtr to enabled, with
|
||||
# enabled-processes = non-renderer:
|
||||
@ -998,6 +991,18 @@ gn_args.config(
|
||||
},
|
||||
)
|
||||
|
||||
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,
|
||||
},
|
||||
)
|
||||
|
||||
gn_args.config(
|
||||
name = "no_siso",
|
||||
args = {
|
||||
|
||||
@ -127,6 +127,7 @@ ci.builder(
|
||||
"x64",
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"no_secondary_abi",
|
||||
],
|
||||
),
|
||||
targets = targets.bundle(
|
||||
@ -180,6 +181,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -820,6 +822,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -970,6 +973,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -1197,6 +1201,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -1261,6 +1266,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
|
||||
@ -292,7 +292,6 @@ ci.builder(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"debug_static_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"remoteexec",
|
||||
"arm64",
|
||||
"webview_google",
|
||||
@ -326,7 +325,6 @@ ci.builder(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"debug_static_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"remoteexec",
|
||||
"x64",
|
||||
"webview_trichrome",
|
||||
@ -375,7 +373,6 @@ ci.builder(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"debug_static_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"remoteexec",
|
||||
"x64",
|
||||
"webview_trichrome",
|
||||
@ -882,7 +879,6 @@ ci.builder(
|
||||
gn_args = gn_args.config(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"release_builder",
|
||||
"remoteexec",
|
||||
"minimal_symbols",
|
||||
@ -1146,7 +1142,6 @@ ci.builder(
|
||||
gn_args = gn_args.config(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"release_builder",
|
||||
"remoteexec",
|
||||
"minimal_symbols",
|
||||
@ -3738,6 +3733,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -3918,6 +3914,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -4152,6 +4149,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -4455,6 +4453,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
@ -4612,6 +4611,7 @@ ci.builder(
|
||||
"x64",
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"no_secondary_abi",
|
||||
],
|
||||
),
|
||||
targets = targets.bundle(
|
||||
@ -4683,6 +4683,7 @@ ci.builder(
|
||||
"x64",
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"no_secondary_abi",
|
||||
],
|
||||
),
|
||||
targets = targets.bundle(
|
||||
@ -4977,6 +4978,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
|
||||
@ -728,6 +728,7 @@ ci.builder(
|
||||
"strip_debug_info",
|
||||
"android_fastbuild",
|
||||
"webview_trichrome",
|
||||
"no_secondary_abi",
|
||||
"webview_shell",
|
||||
],
|
||||
),
|
||||
|
||||
@ -427,8 +427,8 @@ try_.orchestrator_builder(
|
||||
"ci/android-pie-arm64-rel",
|
||||
"release_try_builder",
|
||||
"android_fastbuild",
|
||||
"enable_android_secondary_abi",
|
||||
"fail_on_android_expectations",
|
||||
"no_secondary_abi",
|
||||
"use_clang_coverage",
|
||||
"partial_code_coverage_instrumentation",
|
||||
],
|
||||
@ -1177,7 +1177,6 @@ try_.builder(
|
||||
gn_args = gn_args.config(
|
||||
configs = [
|
||||
"ci/Android arm64 Builder (dbg)",
|
||||
"enable_android_secondary_abi",
|
||||
"release_try_builder",
|
||||
"strip_debug_info",
|
||||
"webview_monochrome",
|
||||
@ -1196,7 +1195,6 @@ try_.builder(
|
||||
gn_args = gn_args.config(
|
||||
configs = [
|
||||
"ci/Android arm64 Builder (dbg)",
|
||||
"enable_android_secondary_abi",
|
||||
"release_try_builder",
|
||||
"strip_debug_info",
|
||||
"webview_monochrome",
|
||||
@ -1323,7 +1321,6 @@ try_.builder(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"debug_try_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"remoteexec",
|
||||
"compile_only",
|
||||
"arm64",
|
||||
@ -1486,7 +1483,6 @@ try_.builder(
|
||||
configs = [
|
||||
"android_builder",
|
||||
"debug_try_builder",
|
||||
"enable_android_secondary_abi",
|
||||
"remoteexec",
|
||||
"compile_only",
|
||||
"arm64",
|
||||
|
||||
Reference in New Issue
Block a user