commit 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd
author Andrew Grieve <agrieve@chromium.org> Fri Mar 14 14:40:28 2025
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 14 14:40:28 2025
tree 516efb67620ffffc0619b80f958c9a301479c6e0
parent 9514d4c554dda6ad2af7bd6baab5027766490404

Reland "Android: Disable secondary ABIs by default"

This reverts commit 455cc52eb9abef738c3ee82ca310b6981efb61cd.

Reason for reland: Fixed internal target in separate CL

Original change's description:
> Revert "Android: Disable secondary ABIs by default"
>
> This reverts commit 407d0b93778b1ec5727d3c817e49f13724bad7db.
>
> 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}