Reland "Android: Disable secondary ABIs by default"

This reverts commit 455cc52eb9.

Reason for reland: Fixed internal target in separate CL

Original change's description:
> 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}

Bug: 403251140
Bug: 391382988
Change-Id: I610832db0e131c579a6f80c07b60e3ee1c2d2cb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355068
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432718}

android_webview/system_webview_apk_tmpl.gni

@@ -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,21 +195,25 @@ 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" ]
       }
     }

android_webview/system_webview_bundle.gni

@@ -34,7 +34,7 @@ template("system_webview_bundle") {
       is_multi_abi = _include_32_bit_webview && _include_64_bit_webview
       not_needed([ "_include_64_bit_webview" ])
       if (!defined(android_app_secondary_abi)) {
-        assert(!is_multi_abi)
+        assert(!is_multi_abi, "target should not be enabled: $target_name")
       }
     }
 

build/android/apk_operations.py

@@ -1373,7 +1373,12 @@ class _Command:
         logging.debug('Device supports (filtered): %r', device_abis)
 
       if any(abi in app_abis for abi in device_abis):
-        fully_supported.append(device)
+        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))
       else:  # No common supported ABIs between the device and app.
         if device_primary_abi == 'x86':
           target_cpu = 'x86'

build/config/android/abi.gni

@@ -26,10 +26,11 @@ declare_args() {
   # Build additional browser splits with HWASAN instrumentation enabled.
   build_hwasan_splits = false
 
-  # 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
+  # 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
 }
 
 assert(!devtools_instrumentation_dumping || use_order_profiling,
@@ -92,7 +93,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 (!skip_secondary_abi_for_cq) {
+if (enable_android_secondary_abi) {
   if (target_cpu == "arm64") {
     android_secondary_abi_cpu = "arm"
     android_app_secondary_abi = "armeabi-v7a"

infra/config/generated/builders/build/android-build-perf-ninja/gn-args.json

@@ -4,13 +4,12 @@
     "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
     "dcheck_always_on": true,
     "debuggable_apks": false,
-    "enable_chrome_android_internal": false,
+    "enable_android_secondary_abi": true,
     "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",

infra/config/generated/builders/build/android-build-perf-siso/gn-args.json

@@ -6,13 +6,12 @@
         "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
         "dcheck_always_on": true,
         "debuggable_apks": false,
-        "enable_chrome_android_internal": false,
+        "enable_android_secondary_abi": true,
         "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",
@@ -30,13 +29,12 @@
         "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
         "dcheck_always_on": true,
         "debuggable_apks": false,
-        "enable_chrome_android_internal": false,
+        "enable_android_secondary_abi": true,
         "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",

infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": true,

infra/config/generated/builders/ci/Android x64 Builder (dbg)/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": true,

infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": true,

infra/config/generated/builders/ci/android-10-arm64-rel/gn-args.json

@@ -3,6 +3,7 @@
     "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,

infra/config/generated/builders/ci/android-12-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-12l-x64-rel-cq/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-13-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-13-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-14-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-14-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-15-tablet-landscape-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-15-tablet-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-15-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-15-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-16-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-arm64-proguard-rel/gn-args.json

@@ -2,6 +2,7 @@
   "gn_args": {
     "dcheck_always_on": false,
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": false,

infra/config/generated/builders/ci/android-chrome-13-x64-wpt-android-specific/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-fieldtrial-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-webview-13-x64-hostside-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/ci/android-webview-13-x64-wpt-android-specific/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-10-arm64-rel/gn-args.json

@@ -3,6 +3,7 @@
     "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,

infra/config/generated/builders/try/android-12-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-12-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-12l-landscape-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-12l-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-12l-x64-rel-cq/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-13-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-13-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-14-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-14-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-15-tablet-landscape-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-15-tablet-landscape-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-15-tablet-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-15-tablet-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-15-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-15-x64-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-16-x64-fyi-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-arm64-all-targets-dbg/gn-args.json

@@ -2,6 +2,7 @@
   "gn_args": {
     "android_static_analysis": "off",
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-arm64-rel/gn-args.json

@@ -4,13 +4,12 @@
     "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
     "dcheck_always_on": true,
     "debuggable_apks": false,
-    "enable_chrome_android_internal": false,
+    "enable_android_secondary_abi": true,
     "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",

infra/config/generated/builders/try/android-chrome-13-x64-wpt-android-specific/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-fieldtrial-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-webview-12-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-webview-13-x64-dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/generated/builders/try/android-webview-13-x64-hostside-rel/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-webview-13-x64-wpt-android-specific/gn-args.json

@@ -3,12 +3,10 @@
     "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",

infra/config/generated/builders/try/android-webview-oreo-arm64-dbg/gn-args.json

@@ -2,6 +2,7 @@
   "gn_args": {
     "dcheck_always_on": true,
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": false,

infra/config/generated/builders/try/android-webview-pie-arm64-dbg/gn-args.json

@@ -2,6 +2,7 @@
   "gn_args": {
     "dcheck_always_on": true,
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": false,
     "is_debug": false,

infra/config/generated/builders/try/android-x64-rel/gn-args.json

@@ -4,12 +4,10 @@
     "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",

infra/config/generated/builders/try/android_compile_dbg/gn-args.json

@@ -1,6 +1,7 @@
 {
   "gn_args": {
     "debuggable_apks": false,
+    "enable_android_secondary_abi": true,
     "ffmpeg_branding": "Chrome",
     "is_component_build": true,
     "is_debug": true,

infra/config/gn_args/gn_args.star

@@ -564,6 +564,13 @@ 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:
@@ -991,18 +998,6 @@ 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 = {

infra/config/subprojects/chromium/ci/chromium.android.fyi.star

@@ -127,7 +127,6 @@ ci.builder(
             "x64",
             "strip_debug_info",
             "android_fastbuild",
-            "no_secondary_abi",
         ],
     ),
     targets = targets.bundle(
@@ -181,7 +180,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -822,7 +820,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -973,7 +970,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -1201,7 +1197,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -1266,7 +1261,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),

infra/config/subprojects/chromium/ci/chromium.android.star

@@ -292,6 +292,7 @@ ci.builder(
         configs = [
             "android_builder",
             "debug_static_builder",
+            "enable_android_secondary_abi",
             "remoteexec",
             "arm64",
             "webview_google",
@@ -325,6 +326,7 @@ ci.builder(
         configs = [
             "android_builder",
             "debug_static_builder",
+            "enable_android_secondary_abi",
             "remoteexec",
             "x64",
             "webview_trichrome",
@@ -373,6 +375,7 @@ ci.builder(
         configs = [
             "android_builder",
             "debug_static_builder",
+            "enable_android_secondary_abi",
             "remoteexec",
             "x64",
             "webview_trichrome",
@@ -879,6 +882,7 @@ ci.builder(
     gn_args = gn_args.config(
         configs = [
             "android_builder",
+            "enable_android_secondary_abi",
             "release_builder",
             "remoteexec",
             "minimal_symbols",
@@ -1142,6 +1146,7 @@ ci.builder(
     gn_args = gn_args.config(
         configs = [
             "android_builder",
+            "enable_android_secondary_abi",
             "release_builder",
             "remoteexec",
             "minimal_symbols",
@@ -3733,7 +3738,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -3914,7 +3918,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -4149,7 +4152,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -4453,7 +4455,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),
@@ -4611,7 +4612,6 @@ ci.builder(
             "x64",
             "strip_debug_info",
             "android_fastbuild",
-            "no_secondary_abi",
         ],
     ),
     targets = targets.bundle(
@@ -4683,7 +4683,6 @@ ci.builder(
             "x64",
             "strip_debug_info",
             "android_fastbuild",
-            "no_secondary_abi",
         ],
     ),
     targets = targets.bundle(
@@ -4978,7 +4977,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),

infra/config/subprojects/chromium/ci/chromium.fyi.star

@@ -728,7 +728,6 @@ ci.builder(
             "strip_debug_info",
             "android_fastbuild",
             "webview_trichrome",
-            "no_secondary_abi",
             "webview_shell",
         ],
     ),

infra/config/subprojects/chromium/try/tryserver.chromium.android.star

@@ -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,6 +1177,7 @@ 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",
@@ -1195,6 +1196,7 @@ 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",
@@ -1321,6 +1323,7 @@ try_.builder(
         configs = [
             "android_builder",
             "debug_try_builder",
+            "enable_android_secondary_abi",
             "remoteexec",
             "compile_only",
             "arm64",
@@ -1483,6 +1486,7 @@ try_.builder(
         configs = [
             "android_builder",
             "debug_try_builder",
+            "enable_android_secondary_abi",
             "remoteexec",
             "compile_only",
             "arm64",