Skip to content

M137 release#2

Closed
pblazej wants to merge 1310 commits intomainfrom
m137_release
Closed

M137 release#2
pblazej wants to merge 1310 commits intomainfrom
m137_release

Conversation

@pblazej
Copy link
Copy Markdown
Contributor

@pblazej pblazej commented Jun 16, 2025

No description provided.

anforowicz and others added 30 commits March 12, 2025 08:37
This helps to trim some unnecessary dependencies.  `vendor` command will
be changed in a separate, follow-up CL (see the WIP CL at
https://crrev.com/c/6331448).

Bug: 395924069
Change-Id: Iac70205228edbc49f1fd0efe01e100da634489bb
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6259145
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431528}
NOKEYCHECK=True
GitOrigin-RevId: 7c78315a706899c43109111a1a8ac9bc3564bf84
This is essentially a reland of
https://chromium-review.googlesource.com/c/chromium/src/+/4579589 which
was reverted because it was breaking a WPT test for WebAudio due to
float precision issues on macOS 11, see crbug.com/40915857.

Since then, the upstream test has been updated to increase tolerances,
see
web-platform-tests/wpt@e164c49.

Original change description:
olivierli@chromium.org discovered that CPU_ARM_NEON is not defined where
it should (in particular on ARM64). This commit fixes the detection.

However, fixing this makes ARM64 builds fail. This is because of buggy
hand-written assembly code in WTF::CopyLCharsFramUCharSource() for the
NEON path. The path uses inline assembly to perform the char16_t -> char
conversion in the case where all the characters in the char16_t array
are 8-bit. This is potentially quite hot code in blink, but the code is
broken because it uses inline assembly with incorrect registers.

A clean solution would be to use intrinsics, but a lazier one is to
trust the "sufficiently smart compiler", which indeed auto-vectorizes
the loop at "-O2" (tested with compiler explorer, on reasonably recent
clang versions). Since this assembly code path wasn't used before, we
lose nothing by not using inline assembly.

For reference, the error message generated when leaving the inline
assembly as is:

In file included from ../../third_party/blink/renderer/platform/wtf/text/wtf_string.cc:41:
../../third_party/blink/renderer/platform/wtf/text/copy_lchars_from_uchar_source.h:97:11: error: vector register expected
      asm("vld2.8   { d0-d1 }, [%[SOURCE]] !\n\t"
          ^
<inline asm>:1:13: note: instantiated into assembly here
        vld2.8   { d0-d1 }, [x1] !

Also need to update a webaudio fingerprinting test. The result changes
because... floating point, and enabling NEON expectedly changes the
results.

Note for sheriffs: If there is a build breakage on ARM64 in range, this is likely the culprit.

Change-Id: I2ba48eaa3924148b79f1a80be244949e9e195805
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6343101
Commit-Queue: Benoit Lize <lizeb@chromium.org>
Reviewed-by: Hongchan Choi <hongchan@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431544}
NOKEYCHECK=True
GitOrigin-RevId: 474745dc9149c90abb41799469a0593a529e270f
Proc macro shared objects are placed in the $root_out_dir of the host
toolchain, but the name didn't include the crate version. Two versions
of a proc macro library would result in an output file collision.

Make the file names unique by including the crate epoch.

Bug: 402130377
Change-Id: I09720eaaac0b1289c114cf08a505389097cb3285
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6341287
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431548}
NOKEYCHECK=True
GitOrigin-RevId: 7846c38f396aa03d82ecea16f1f2f6014d2b0b13
We used to only recover device before the last round of try.
But test devices, especially emulator can start with a bad state, and
cause majority of test to fail. In this case, it is better to recover
device sooner than the last round.

This will hopefully improve P99 of per-shard runtime, especially
for android_browsertests on Android Desktop builder

Also remove the logic for lollipop since it is deprecated.

Bug: 391893869
Change-Id: I43f24a847425000335e7a06d52336df2ed27772a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6341612
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1431592}
NOKEYCHECK=True
GitOrigin-RevId: 4214ec2598bae2f5556102483161354262634a71
This reverts commit 97b7fd5eb389b0aa0cca1410165778148fcb94d8.

Reason for revert:
unsafe_buffers_paths.txt is only used when
clang_use_chrome_plugins == true,
so no need to add rewrapper `-inputs=`
if clang_use_chrome_plugins == false.

Original change's description:
> Revert "fail if rbe_exec_root is set with use_siso=true"
>
> This reverts commit 9436c1142c5404ffd24be354c289c0a9064abb76.
>
> Reason for revert: break ChromeOS builders b/402483181
>
> Original change's description:
> > fail if rbe_exec_root is set with use_siso=true
> >
> > Siso doesn't handle rbe_exec_root.
> >
> > Bug: 402060808, 313567009
> > Change-Id: Idf97c984f57d51414fa5233c0ce182182f2f5c8b
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6342492
> > Auto-Submit: Fumitoshi Ukai <ukai@google.com>
> > Commit-Queue: Junji Watanabe <jwata@google.com>
> > Reviewed-by: Junji Watanabe <jwata@google.com>
> > Commit-Queue: Fumitoshi Ukai <ukai@google.com>
> > Cr-Commit-Position: refs/heads/main@{#1430690}
>
> Bug: 402060808, 313567009, 402483181
> Change-Id: I815009b3d48ced9c63a78df3376620524684bbd4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6343401
> Reviewed-by: Fumitoshi Ukai <ukai@google.com>
> Reviewed-by: Junji Watanabe <jwata@google.com>
> Commit-Queue: Jeffrey Young <cowmoo@google.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Reviewed-by: Philipp Wollermann <philwo@google.com>
> Cr-Commit-Position: refs/heads/main@{#1431248}

Bug: 402060808, 313567009, 402483181
Change-Id: Iba5222fc330b397fff4c88f2fbef8194ce030713
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6345112
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Jeffrey Young <cowmoo@google.com>
Reviewed-by: Jeffrey Young <cowmoo@google.com>
Cr-Commit-Position: refs/heads/main@{#1431617}
NOKEYCHECK=True
GitOrigin-RevId: 4d095641e533599b53c45d8639a35fceadbc08a8
Adds some common utilities to //build/autoroll to standardize how we
handle gradle projects as well as extracting to_commit.zip

Bug: 40774645
Change-Id: Ifcc05f1ad3b3215030750aa3913dca3acda1901a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6348858
Reviewed-by: Peter Wen <wnwen@chromium.org>
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431709}
NOKEYCHECK=True
GitOrigin-RevId: 27da9af6772797acf18dfef51b954e33ff1bbb4b
*.modulemap is used for C++ module compile,
so include *.modulemap in :headers precomputed trees

Bug: 402356473
Change-Id: Ib3f54770bd180dcc308407a1a6343ca2bc2d0843
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6345776
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1431872}
NOKEYCHECK=True
GitOrigin-RevId: 2dec8099f7cad97dee9812b77c1cedf7e7508559
Bug: 402356473
Change-Id: Id3ef632463e9324a757af78c813f9fa842678e1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6342812
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431945}
NOKEYCHECK=True
GitOrigin-RevId: 66db194d079816c1705de2d2f5e1e21f4e5e9323
This is to fix fallback error due to missing sanitizer ignorelist error
in
https://ci.chromium.org/ui/p/chromium/builders/try/linux-official/1446/overview
See error log from "upload siso reports|gsutil upload siso_output" step.

Bug: 377426017
Change-Id: Ib7282ed817e3f5c46a237d6fc6950cc059e3f280
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6350536
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431970}
NOKEYCHECK=True
GitOrigin-RevId: baf76560555e5f29b477af852e99d76c90797e79
IS_DESKTOP_ANDROID is being used excessively and a warning in build.gn with guidance on how it should be used and provide a mailing list for questions.

TEST=None
Bug=None

Change-Id: I599e698109ebee2f82628333af426c9364a779cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6343878
Auto-Submit: Brian Geffon <bgeffon@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432008}
NOKEYCHECK=True
GitOrigin-RevId: be2f9c00fec91c30efcc22a3849db7c0c75b9b05
…58-gaa008e00-1 / 9fcc9cf4a202aadfe1f44722b39c83536eba3dba-2 : aaa2d47daebb02454fc7c08c04c3c603d5efeedb-1

https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/7b473dfe..aa008e00

https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/9fcc9cf4a202..aaa2d47daebb

Ran: ./tools/clang/scripts/upload_revision.py aa008e00085a260b2ed130b3430cc4640144ab30

Also temporarily disable -Wimplicit-int-conversion for fuchsia (see
crbug.com/402154971), and add ___llvm_write_custom_profile to
framework.order (see crbug.com/402425842).

Binary-Size: android 64-bit growth due to pgo skew, see crbug.com/400808895#comment8
Bug: 397258342, 402154971, 402425842
Change-Id: Ia29cb8819ca126afcab86c117648ff0a3d3908ea
Disable-Rts: True
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-rel
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-riscv64-rel
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-dbg
Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-rel
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6348878
Auto-Submit: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432105}
NOKEYCHECK=True
GitOrigin-RevId: adcc5dc063598f998f5b23b27db91f893719736c
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}
NOKEYCHECK=True
GitOrigin-RevId: 407d0b93778b1ec5727d3c817e49f13724bad7db
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}
NOKEYCHECK=True
GitOrigin-RevId: 455cc52eb9abef738c3ee82ca310b6981efb61cd
Bug: 399971240
Bug: 341792617
Test: build target introduced in child cl and inspect resulting aar

Change-Id: Idbd6fea8b45c7060a9593a0bbef52929efeca614
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6350477
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Simeon Anfinrud <sanfin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432347}
NOKEYCHECK=True
GitOrigin-RevId: e68e783bf20cc2434f6f9385a182240835025423
nocompile_test step fails when use_reclient=true is set.
https://ci.chromium.org/ui/p/chrome/builders/ci/android-desktop-x64-compile-rel/2735/infra

This CL overrides use_reclient=false as same as use_remoteexec.

Bug: 403379511
Change-Id: I7c9dacc9598245d60eae741af13adddf2e95eecf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355212
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1432495}
NOKEYCHECK=True
GitOrigin-RevId: e1a4a9469e6e865b87e18fc98630f41671199d98
Reducing --secoundary_mem_pre_link=4GB to 8GB made Android
builds too slow, and ended up with timeout like this.
https://ci.chromium.org/ui/p/chrome/builders/ci/android-arm64/b8720631978360958353/overview
Context: https://crrev.com/c/6343768

This should increase the Java step concurrency from 2 to 3 on the bot.

Bug: 402724157, 398058215, 399665139
Change-Id: I31a3fdce3d134a5b5a0de358799017293537c183
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6354275
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Junji Watanabe <jwata@google.com>
Commit-Queue: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1432504}
NOKEYCHECK=True
GitOrigin-RevId: a1987a2128d8fcd44bb5b88c0ea9ca491bb7e66a
Android release builds switched to -Os from -Oz, and I suspect that's
why debug builds were using -Oz (they didn't get switched to match).

Enabling -gc-sections reduces Monochrome.apk fat binary size
2.2gb -> 1.2gb, bringing it back under the limit at which APK Signer
crashes with IndexOutOfBoundsExeception.

Bug: 402645059, 384067100
Change-Id: Ifd0dac444a68afa3818a3732183e30ed061ed3f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355963
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432511}
NOKEYCHECK=True
GitOrigin-RevId: b2c4fc142858b91f6d13cb67d4d0f25c9dd73965
Bug: none
Change-Id: Idae290112561e5658c614f5eae8895abfe996124
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6333513
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432518}
NOKEYCHECK=True
GitOrigin-RevId: 3fb3bab213348955edc18a051f9c3f86241309e8
use_siso itself won't change build graph,
but it would be used to define default value of use_reclient.

so, set use_siso default value as same as autoninja.

Bug: 379584977
Change-Id: I99954773166d97f283892e22e743bc20a6ba3ce0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355885
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1432537}
NOKEYCHECK=True
GitOrigin-RevId: 45d64ae5504311d5de1ae30cc3dd74e4be1c96f2
autoninja side fix: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6355865

Bug: 379584977
Change-Id: I9f34db17bd13a762bce41bcaceabc1320a351201
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355944
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1432547}
NOKEYCHECK=True
GitOrigin-RevId: fd011815c455976b15e31966f826628b4f9f61d4
…-init-4858-gaa008e00-1 / 9fcc9cf4a202aadfe1f44722b39c83536eba3dba-2 : aaa2d47daebb02454fc7c08c04c3c603d5efeedb-1"

This reverts commit adcc5dc063598f998f5b23b27db91f893719736c.

Reason for revert:
LUCI Bisection has identified this change as the cause of a test failure. See the analysis: https://ci.chromium.org/ui/p/chromium/bisection/test-analysis/b/4716176371351552

Sample build with failed test: https://ci.chromium.org/b/8720476572564784385
Affected test(s):
[ninja://chrome/test:browser_tests/MediaFoundationEncryptedMediaTest.FallbackTest_KeySystemNotSupported](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:browser_tests%2FMediaFoundationEncryptedMediaTest.FallbackTest_KeySystemNotSupported?q=VHash%3Ab8d1090926eaa9f0)
[ninja://chrome/test:browser_tests/MediaFoundationEncryptedMediaTest.Playback_ClearLeadEncryptedCbcsVideo_Success](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:browser_tests%2FMediaFoundationEncryptedMediaTest.Playback_ClearLeadEncryptedCbcsVideo_Success?q=VHash%3Ab8d1090926eaa9f0)
[ninja://chrome/test:browser_tests/MediaFoundationEncryptedMediaTest.Playback_ClearLeadEncryptedCencVideo_Success](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:browser_tests%2FMediaFoundationEncryptedMediaTest.Playback_ClearLeadEncryptedCencVideo_Success?q=VHash%3Ab8d1090926eaa9f0)
[ninja://chrome/test:browser_tests/MediaFoundationEncryptedMediaTest.Playback_DolbyVisionProfile5CencClearLeadVideo_Success](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:browser_tests%2FMediaFoundationEncryptedMediaTest.Playback_DolbyVisionProfile5CencClearLeadVideo_Success?q=VHash%3Ab8d1090926eaa9f0)
[ninja://chrome/test:browser_tests/MediaFoundationEncryptedMediaTest.Playback_DolbyVisionProfile5CencVideo_Success](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:browser_tests%2FMediaFoundationEncryptedMediaTest.Playback_DolbyVisionProfile5CencVideo_Success?q=VHash%3Ab8d1090926eaa9f0)
and 10 more ...

If this is a false positive, please report it at http://b.corp.google.com/createIssue?component=1199205&description=Analysis%3A+https%3A%2F%2Fci.chromium.org%2Fui%2Fp%2Fchromium%2Fbisection%2Ftest-analysis%2Fb%2F4716176371351552&format=PLAIN&priority=P3&title=Wrongly+blamed+https%3A%2F%2Fchromium-review.googlesource.com%2Fc%2Fchromium%2Fsrc%2F%2B%2F6348878&type=BUG

Original change's description:
> Roll clang+rust llvmorg-21-init-1655-g7b473dfe-1 : llvmorg-21-init-4858-gaa008e00-1 / 9fcc9cf4a202aadfe1f44722b39c83536eba3dba-2 : aaa2d47daebb02454fc7c08c04c3c603d5efeedb-1
>
> https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/7b473dfe..aa008e00
>
> https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/9fcc9cf4a202..aaa2d47daebb
>
> Ran: ./tools/clang/scripts/upload_revision.py aa008e00085a260b2ed130b3430cc4640144ab30
>
> Also temporarily disable -Wimplicit-int-conversion for fuchsia (see
> crbug.com/402154971), and add ___llvm_write_custom_profile to
> framework.order (see crbug.com/402425842).
>
> Binary-Size: android 64-bit growth due to pgo skew, see crbug.com/400808895#comment8
> Bug: 397258342, 402154971, 402425842
> Change-Id: Ia29cb8819ca126afcab86c117648ff0a3d3908ea
> Disable-Rts: True
> Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
> Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
> Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
> Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
> Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
> Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
> Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
> Cq-Include-Trybots: chromium/try:mac-official,linux-official
> Cq-Include-Trybots: chromium/try:win-official,win32-official
> Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-arm64-rel
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-riscv64-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-riscv64-rel
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-mainline-clang-x86-rel
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
> Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
> Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
> Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
> Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
> Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
> Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
> Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
> Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-rel
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6348878
> Auto-Submit: Hans Wennborg <hans@chromium.org>
> Commit-Queue: Hans Wennborg <hans@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1432105}
>

Bug: 397258342, 402154971, 402425842
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I9cb8a2682f3866dd53e1ccd52d3abf1eb3105f45
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355860
Owners-Override: Yoshisato Yanagisawa <yyanagisawa@google.com>
Commit-Queue: Greg Thompson <grt@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432566}
NOKEYCHECK=True
GitOrigin-RevId: c35b78b1150b978941b701e9cc091aa3d94d8cf1
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}
NOKEYCHECK=True
GitOrigin-RevId: 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd
This reverts commit 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd.

Reason for revert: Broke internal bot

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

Bug: 403541840
Bug: 391382988
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I913a89eb491242c80a961bf90e2e45666b104970
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356671
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1432767}
NOKEYCHECK=True
GitOrigin-RevId: 18502f6556aae0d60a0d2cec9efd2c28d524e01b
This reverts commit 45d64ae5504311d5de1ae30cc3dd74e4be1c96f2.

Reason for revert: breaks non-Chromium build
https://chromium-review.googlesource.com/c/angle/angle/+/6355316
https://ci.chromium.org/ui/p/angle/builders/try/linux-test/26483/overview
ERROR at //build/toolchain/siso.gni:18:52: Undefined identifier
if (path_exists("//build/config/siso/.sisoenv") && build_with_chromium &&

Original change's description:
> set use_siso default value as autoninja
>
> use_siso itself won't change build graph,
> but it would be used to define default value of use_reclient.
>
> so, set use_siso default value as same as autoninja.
>
> Bug: 379584977
> Change-Id: I99954773166d97f283892e22e743bc20a6ba3ce0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355885
> Auto-Submit: Fumitoshi Ukai <ukai@google.com>
> Commit-Queue: Fumitoshi Ukai <ukai@google.com>
> Reviewed-by: Junji Watanabe <jwata@google.com>
> Cr-Commit-Position: refs/heads/main@{#1432537}

Bug: 379584977
Change-Id: I969d2031b7e8363335ab6cb9ea538a04f920e6b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355806
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432782}
NOKEYCHECK=True
GitOrigin-RevId: 561dfad17c047cf2da2c0a7224871a1ba5769edf
Similar to the fix https://crrev.com/c/6355212, this is to fix the
compile error in http://ci.chromium.org/b/8720408648055680897

This CL overrides use_reclient=false as same as use_remoteexec.

Bug: 403379511
Change-Id: I7ff2a23e9f5c12cdc0464985a57a54d4a27af2da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6355792
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432872}
NOKEYCHECK=True
GitOrigin-RevId: 94ab84cbb5e5b37306b7dbcec5b3d32dcbcbfff4
This reverts commit 18502f6556aae0d60a0d2cec9efd2c28d524e01b.

Reason for revert: Out-of-band fix applied & Updated bot list

Original change's description:
> Revert "Reland "Android: Disable secondary ABIs by default""
>
> This reverts commit 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd.
>
> Reason for revert: Broke internal bot
>
> Original change's description:
> > 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}
>
> Bug: 403541840
> Bug: 391382988
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I913a89eb491242c80a961bf90e2e45666b104970
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356671
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#1432767}

Bug: 391382988
Change-Id: Icb3567d13b77a01bd6462d0a776b72ada1ce968e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6357954
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432921}
NOKEYCHECK=True
GitOrigin-RevId: 650d403cb799d49737e6e2a25cfd62273ed929f4
This reverts commit 650d403cb799d49737e6e2a25cfd62273ed929f4.

Reason for revert: Broke apk_operstions device check.

Original change's description:
> Reland #2 "Android: Disable secondary ABIs by default"
>
> This reverts commit 18502f6556aae0d60a0d2cec9efd2c28d524e01b.
>
> Reason for revert: Out-of-band fix applied & Updated bot list
>
> Original change's description:
> > Revert "Reland "Android: Disable secondary ABIs by default""
> >
> > This reverts commit 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd.
> >
> > Reason for revert: Broke internal bot
> >
> > Original change's description:
> > > 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}
> >
> > Bug: 403541840
> > Bug: 391382988
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Change-Id: I913a89eb491242c80a961bf90e2e45666b104970
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356671
> > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Cr-Commit-Position: refs/heads/main@{#1432767}
>
> Bug: 391382988
> Change-Id: Icb3567d13b77a01bd6462d0a776b72ada1ce968e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6357954
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1432921}

Bug: 391382988
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I2cb9fecca231eb77cb6ddd22a9465a476d3aad72
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6358036
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432937}
NOKEYCHECK=True
GitOrigin-RevId: 8f4cb90039a9d1c08688f2e2c84ded7f3c6c4a31
This reverts commit 8f4cb90039a9d1c08688f2e2c84ded7f3c6c4a31.

Reason for reland: Fixed missing line in apk_operations.py

Original change's description:
> Revert "Reland #2 "Android: Disable secondary ABIs by default""
>
> This reverts commit 650d403cb799d49737e6e2a25cfd62273ed929f4.
>
> Reason for revert: Broke apk_operstions device check.
>
> Original change's description:
> > Reland #2 "Android: Disable secondary ABIs by default"
> >
> > This reverts commit 18502f6556aae0d60a0d2cec9efd2c28d524e01b.
> >
> > Reason for revert: Out-of-band fix applied & Updated bot list
> >
> > Original change's description:
> > > Revert "Reland "Android: Disable secondary ABIs by default""
> > >
> > > This reverts commit 0cf7c01a348dfa85f37ff6cc0d30a669ba8a4ddd.
> > >
> > > Reason for revert: Broke internal bot
> > >
> > > Original change's description:
> > > > 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}
> > >
> > > Bug: 403541840
> > > Bug: 391382988
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Change-Id: I913a89eb491242c80a961bf90e2e45666b104970
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356671
> > > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Cr-Commit-Position: refs/heads/main@{#1432767}
> >
> > Bug: 391382988
> > Change-Id: Icb3567d13b77a01bd6462d0a776b72ada1ce968e
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6357954
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Sam Maier <smaier@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1432921}
>
> Bug: 391382988
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I2cb9fecca231eb77cb6ddd22a9465a476d3aad72
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6358036
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1432937}

No-Try: true
Bug: 391382988
Change-Id: Ibfe2ccb8d9ed6ff510537efbb6f4046f94de80dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356438
Reviewed-by: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432951}
NOKEYCHECK=True
GitOrigin-RevId: 81222774947d4661f11368fecddcbf187d628b99
…nitializer

Bug: 389129271
Change-Id: Ifb5a87b53f814227e49b71b6b42e10e142ffb1cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356673
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432977}
NOKEYCHECK=True
GitOrigin-RevId: ab0214805e88ca8fbae5c3ce1518ae42ff126f0d
Bug: 395924069
Change-Id: I4830605af47052fc224c826cf92d14e940890581
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6354929
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432996}
NOKEYCHECK=True
GitOrigin-RevId: fb059d22e3359aaf9aa9fea0c3ee2734b0110b1a
chromium-internal-autoroll and others added 21 commits April 23, 2025 16:22
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/fuchsia-internal-images-chromium
Please CC chrome-fuchsia-gardener@grotations.appspotmail.com,chrome-fuchsia-team@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Cq-Include-Trybots: luci.chrome.try:fuchsia-internal-images-roller
Tbr: chrome-fuchsia-gardener@grotations.appspotmail.com
Disable-Retries: true
Change-Id: I77fffe7404d82384f9eea87d93abf6cb1425cd2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6485096
Bot-Commit: chromium-internal-autoroll <chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com>
Commit-Queue: chromium-internal-autoroll <chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1450856}
NOKEYCHECK=True
GitOrigin-RevId: daf6510490b6fe7fb37ad251eee94f1681e000c8
…y step""

This reverts commit 560a6781b2bb987d385cc9f7d69bd53f838c28aa.

Reason for revert: Dex error still happening:
com.android.tools.r8.errors.CompilationError: Absent Code attribute in method that is not native or abstract

Bug: 398002893
Original change's description:
> Reland "Android: Merge filter_zip.py step into compile_java.py step"
>
> This reverts commit 5840f11d9ac58b39f3f934aaddb078429260511a.
>
> Reason for reland: Fixed prebuilts with filters.
>
> Bug: 398002893
> Original change's description:
> > Revert "Android: Merge filter_zip.py step into compile_java.py step"
> >
> > This reverts commit 57825c3bb5083df80f4999ac78f1613c69fc906c.
> >
> > Reason for revert: Internal bots failing on R8 step with:
> > com.android.tools.r8.errors.CompilationError: Absent Code attribute in method that is not native or abstract
> >
> > E.g.:
> > https://ci.chromium.org/ui/p/chrome/builders/ci/android-arm64-high/29753/overview
> >
> > Bug: 398002893
> > Original change's description:
> > > Android: Merge filter_zip.py step into compile_java.py step
> > >
> > > Saves an action for every android_library target.
> > >
> > > Number of GN targets for debug android: 58689 -> 57994
> > > Size of build.ninja: 806741686 -> 798996799 (about -7.5mb)
> > >
> > > Might break "bytecode_rewriter_target", but there are no current
> > > uses of it to test it...
> > >
> > > This combines "device_jar_path" and "host_jar_path" into a single
> > > "processed_jar_path", since the processing of both are identical.
> > >
> > > Bug: 398002893
> > > Change-Id: Ia5ad8a136edd64175e04ab069762862d8c5abba9
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6443997
> > > Reviewed-by: Sam Maier <smaier@chromium.org>
> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1450203}
> >
> > Bug: 398002893
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Change-Id: I8ce76363a3488ada3a920bc874301d5f85c6f449
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6481068
> > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Cr-Commit-Position: refs/heads/main@{#1450313}
>
> Bug: 398002893
> Change-Id: I508d26db4437fff615a82f80a7d711a6e532d4b8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479447
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1450525}

Bug: 398002893
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Ia0469e6e97c6044509e469fb560f7a96bc7ebd88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6485453
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1450899}
NOKEYCHECK=True
GitOrigin-RevId: 51dea160decf9ea725de13c9152080179ef5b099
These compile units have been removed by
https://chromium-review.googlesource.com/c/chromium/src/+/6481699

Bug: 411537162
Change-Id: I9939e80c70bd9d74f17f26d3e304d8ec6574a93a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486506
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1450914}
NOKEYCHECK=True
GitOrigin-RevId: 9e01dd4c33da6dd2890c3adaf72b9a1e505660bc
…66-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1

https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/5b36835d..09006611

https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3f690c2257b7..c8f94230282a

Ran: ./tools/clang/scripts/upload_revision.py 09006611151c7f85862a9da8da34872c456c2c37

Bug: 409287490
Change-Id: Iee1fbf94ac025644cba9af666d60eed0bfc99e7f
Tricium: skip
Disable-Rts: True
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:win-arm64-rel
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Binary-Size: Slight arm32 increase (crbug.com/412726016).
Fuchsia-Binary-Size: See above.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476964
Reviewed-by: Hans Wennborg <hans@chromium.org>
Reviewed-by: Zequan Wu <zequanwu@google.com>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451014}
NOKEYCHECK=True
GitOrigin-RevId: 6445cc175e8648371811f11152688ee83fab4c3e
…-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1"

This reverts commit 6445cc175e8648371811f11152688ee83fab4c3e.

Reason for revert: Suspected to cause V8 build failure on Win x64, compare https://ci.chromium.org/ui/b/8716718588681748337 - the V8 roll in the blamelist/commitrange of this build does not seem to have relevant changes.

Bug: 409287490
Original change's description:
> Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1
>
> https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/5b36835d..09006611
>
> https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3f690c2257b7..c8f94230282a
>
> Ran: ./tools/clang/scripts/upload_revision.py 09006611151c7f85862a9da8da34872c456c2c37
>
> Bug: 409287490
> Change-Id: Iee1fbf94ac025644cba9af666d60eed0bfc99e7f
> Tricium: skip
> Disable-Rts: True
> Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
> Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
> Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
> Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
> Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
> Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
> Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
> Cq-Include-Trybots: chromium/try:mac-official,linux-official
> Cq-Include-Trybots: chromium/try:win-official,win32-official
> Cq-Include-Trybots: chromium/try:win-arm64-rel
> Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
> Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
> Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
> Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
> Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
> Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
> Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
> Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
> Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-rel
> Binary-Size: Slight arm32 increase (crbug.com/412726016).
> Fuchsia-Binary-Size: See above.
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476964
> Reviewed-by: Hans Wennborg <hans@chromium.org>
> Reviewed-by: Zequan Wu <zequanwu@google.com>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1451014}

Bug: 409287490
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:win-arm64-rel
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Ibfaf0ed980cbf0d7c8ab9709ae69a5a54b34f76d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6487906
Owners-Override: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1451034}
NOKEYCHECK=True
GitOrigin-RevId: 0dfde1edaadfc1aaae9fb01e3523b1820a74b2b1
Currently, there's no way to distinguish whether we're building
CronetEngine or HttpEngine (Cronet in AOSP). This meant that we had
to use hacks (eg: look at classloader) which may break at any time.

The tests depended on a special xml file that is only fed to the test
APK, we couldn't do the same for prod.

This new flag will help remove the last bits of divergence that
is leftover in AOSP (UserAgent).

Bug: 412608685
Change-Id: Ie0cf7fac0493ac123e728e2ed5c138b9af8c46d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479291
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Mohannad Farrag <aymanm@google.com>
Auto-Submit: Mohannad Farrag <aymanm@google.com>
Cr-Commit-Position: refs/heads/main@{#1451099}
NOKEYCHECK=True
GitOrigin-RevId: e28d07aba4f15f628664d7f01b520afe96cfd53c
This reverts commit 51dea160decf9ea725de13c9152080179ef5b099.

Reason for reland: Fixed R8 error for non-prebuilts

Bug: 398002893
Original change's description:
> Revert "Reland "Android: Merge filter_zip.py step into compile_java.py step""
>
> This reverts commit 560a6781b2bb987d385cc9f7d69bd53f838c28aa.
>
> Reason for revert: Dex error still happening:
> com.android.tools.r8.errors.CompilationError: Absent Code attribute in method that is not native or abstract
>
>
> Bug: 398002893
> Original change's description:
> > Reland "Android: Merge filter_zip.py step into compile_java.py step"
> >
> > This reverts commit 5840f11d9ac58b39f3f934aaddb078429260511a.
> >
> > Reason for reland: Fixed prebuilts with filters.
> >
> > Bug: 398002893
> > Original change's description:
> > > Revert "Android: Merge filter_zip.py step into compile_java.py step"
> > >
> > > This reverts commit 57825c3bb5083df80f4999ac78f1613c69fc906c.
> > >
> > > Reason for revert: Internal bots failing on R8 step with:
> > > com.android.tools.r8.errors.CompilationError: Absent Code attribute in method that is not native or abstract
> > >
> > > E.g.:
> > > https://ci.chromium.org/ui/p/chrome/builders/ci/android-arm64-high/29753/overview
> > >
> > > Bug: 398002893
> > > Original change's description:
> > > > Android: Merge filter_zip.py step into compile_java.py step
> > > >
> > > > Saves an action for every android_library target.
> > > >
> > > > Number of GN targets for debug android: 58689 -> 57994
> > > > Size of build.ninja: 806741686 -> 798996799 (about -7.5mb)
> > > >
> > > > Might break "bytecode_rewriter_target", but there are no current
> > > > uses of it to test it...
> > > >
> > > > This combines "device_jar_path" and "host_jar_path" into a single
> > > > "processed_jar_path", since the processing of both are identical.
> > > >
> > > > Bug: 398002893
> > > > Change-Id: Ia5ad8a136edd64175e04ab069762862d8c5abba9
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6443997
> > > > Reviewed-by: Sam Maier <smaier@chromium.org>
> > > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > > Cr-Commit-Position: refs/heads/main@{#1450203}
> > >
> > > Bug: 398002893
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Change-Id: I8ce76363a3488ada3a920bc874301d5f85c6f449
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6481068
> > > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Cr-Commit-Position: refs/heads/main@{#1450313}
> >
> > Bug: 398002893
> > Change-Id: I508d26db4437fff615a82f80a7d711a6e532d4b8
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479447
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1450525}
>
> Bug: 398002893
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: Ia0469e6e97c6044509e469fb560f7a96bc7ebd88
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6485453
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#1450899}

Bug: 398002893
Change-Id: I7448643d5a318de32567d66ec1527906466f92c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486094
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451117}
NOKEYCHECK=True
GitOrigin-RevId: 86180695506584e8226a4ed14259e6f0eceabe4e
This CL is part of a two-sided patch and will be submitted alongside
https://chromium-review.googlesource.com/c/catapult/+/6479254

This CL makes a manual roll of the catapult repository.

This CL also fixes some pydeps files that are no longer up-to-date
as a result of the above CL.

This CL also makes some changes to devil_util to make it compatible
with the changes in the above CL.

Bug: 397459590
No-Try: true
Change-Id: I58d88d7dce8760b0d2f14d116cb087684f362e92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6480814
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Martin Kong <martinkong@google.com>
Cr-Commit-Position: refs/heads/main@{#1451188}
NOKEYCHECK=True
GitOrigin-RevId: 30536a2abcae67a7520fba0651ffc47b2eccf6ec
…-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1"

This is a reland of commit 6445cc175e8648371811f11152688ee83fab4c3e
The stack overflow which caused the revert has been addressed (see
crbug.com/413269096).

Original change's description:
> Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1
>
> https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/5b36835d..09006611
>
> https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3f690c2257b7..c8f94230282a
>
> Ran: ./tools/clang/scripts/upload_revision.py 09006611151c7f85862a9da8da34872c456c2c37
>
> Bug: 409287490
> Change-Id: Iee1fbf94ac025644cba9af666d60eed0bfc99e7f
> Tricium: skip
> Disable-Rts: True
> Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
> Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
> Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
> Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
> Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
> Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
> Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
> Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
> Cq-Include-Trybots: chromium/try:mac-official,linux-official
> Cq-Include-Trybots: chromium/try:win-official,win32-official
> Cq-Include-Trybots: chromium/try:win-arm64-rel
> Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
> Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
> Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
> Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
> Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
> Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
> Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
> Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
> Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
> Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
> Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
> Cq-Include-Trybots: chromium/try:win-rust-x64-rel
> Binary-Size: Slight arm32 increase (crbug.com/412726016).
> Fuchsia-Binary-Size: See above.
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476964
> Reviewed-by: Hans Wennborg <hans@chromium.org>
> Reviewed-by: Zequan Wu <zequanwu@google.com>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1451014}

Binary-Size: Slight arm32 increase (crbug.com/412726016).
Fuchsia-Binary-Size: See above.
Bug: 409287490
Change-Id: Ib0b8e3054d2e12eda7a66ab64aefafc660973c3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486639
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Auto-Submit: Hans Wennborg <hans@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451221}
NOKEYCHECK=True
GitOrigin-RevId: 67678771b7597ff0cee1f87610c5b52b30466412
Manual fix:
- Removed unnecessary StringBuilder.
- Ignore new checks (too many to fix in this CL).

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/error-prone-chromium
Please CC agrieve@google.com,clank-build@google.com,clank-library-failures@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

R=martinkong@google.com

Cq-Include-Trybots: luci.chrome.try:android-internal-dbg
Tbr: clank-library-failures@google.com
Change-Id: I1a9e52204920ffda5f28d2b37ca82c7dc9e23a60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6485030
Reviewed-by: Martin Kong <martinkong@google.com>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Owners-Override: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451322}
NOKEYCHECK=True
GitOrigin-RevId: 0b1d4246b71a54c74f5b87a781d3c7bf74388c74
…vmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1""

This reverts commit 67678771b7597ff0cee1f87610c5b52b30466412.

Reason for revert:
LUCI Bisection has identified this change as the culprit of a build failure. See the analysis: https://ci.chromium.org/ui/p/chromium/bisection/compile-analysis/b/8716687820744588913

Sample failed build: https://ci.chromium.org/b/8716687820744588913

If this is a false positive, please report it at http://b.corp.google.com/createIssue?component=1199205&description=Analysis%3A+https%3A%2F%2Fchromium-review.googlesource.com%2Fc%2Fchromium%2Fsrc%2F%2B%2F6486639&format=PLAIN&priority=P3&title=Wrongly+blamed+https%3A%2F%2Fci.chromium.org%2Fui%2Fp%2Fchromium%2Fbisection%2Fcompile-analysis%2Fb%2F8716687820744588913&type=BUG

Original change's description:
> Reland "Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1"
>
> This is a reland of commit 6445cc175e8648371811f11152688ee83fab4c3e
> The stack overflow which caused the revert has been addressed (see
> crbug.com/413269096).
>
> Original change's description:
> > Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1
> >
> > https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/5b36835d..09006611
> >
> > https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3f690c2257b7..c8f94230282a
> >
> > Ran: ./tools/clang/scripts/upload_revision.py 09006611151c7f85862a9da8da34872c456c2c37
> >
> > Bug: 409287490
> > Change-Id: Iee1fbf94ac025644cba9af666d60eed0bfc99e7f
> > Tricium: skip
> > Disable-Rts: True
> > Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
> > Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
> > Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
> > Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
> > Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
> > Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
> > Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
> > Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
> > Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
> > Cq-Include-Trybots: chromium/try:mac-official,linux-official
> > Cq-Include-Trybots: chromium/try:win-official,win32-official
> > Cq-Include-Trybots: chromium/try:win-arm64-rel
> > Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
> > Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
> > Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
> > Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
> > Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
> > Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
> > Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
> > Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
> > Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
> > Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
> > Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
> > Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
> > Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
> > Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
> > Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
> > Cq-Include-Trybots: chromium/try:win-rust-x64-rel
> > Binary-Size: Slight arm32 increase (crbug.com/412726016).
> > Fuchsia-Binary-Size: See above.
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476964
> > Reviewed-by: Hans Wennborg <hans@chromium.org>
> > Reviewed-by: Zequan Wu <zequanwu@google.com>
> > Reviewed-by: Nico Weber <thakis@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1451014}
>
> Binary-Size: Slight arm32 increase (crbug.com/412726016).
> Fuchsia-Binary-Size: See above.
> Bug: 409287490
> Change-Id: Ib0b8e3054d2e12eda7a66ab64aefafc660973c3d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486639
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Hans Wennborg <hans@chromium.org>
> Auto-Submit: Hans Wennborg <hans@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1451221}
>

Bug: 409287490
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iac412f96dbe52bf3616c9768d29ccba7b50b47a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489987
Bot-Commit: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
Owners-Override: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
Commit-Queue: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1451360}
NOKEYCHECK=True
GitOrigin-RevId: d6a3e87dd78d594fea16772006309fa80c41e44b
Use write_file() rather than command-line flags to pass information from
GN -> write_build_config.py
 * Creates $target_out_dir/$target_name.params.json files
 * Reduces the size of .ninja files
 * Enables auxiliary tools that read .build_config.json files to instead
   read .params.json, which do not need to be built.
 * Reduces boiler-plate in write_build_config.py

Other simplifications:
 * Remove outdated documentation about build_config values
 * Renamed some build_config.json keys to improve consistency
 * Moves uncompressed_assets and final_dex_path for bundle modules
   into the bundle's build_config (so that the module's config is
   not needed)

I've attempted to update all tools that read .build_config.json files.

build.ninja files: 884650045->878689015 (about 6mb smaller)
.build_config.json: 285674537->273369616(about 12mb smaller)

Bug: 413331591
Change-Id: I6d01f4fea04b95a1d3911e0538f0e1a4090a4dcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479572
Reviewed-by: Peter Wen <wnwen@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451366}
NOKEYCHECK=True
GitOrigin-RevId: 96f90bea226aad4c34f98e051dc414c06f6171b0
This reverts commit 96f90bea226aad4c34f98e051dc414c06f6171b0.

Reason for revert: Broke trace_event_rewritten target

Bug: 413331591
Original change's description:
> Android: Revamp .build_config.json files
>
> Use write_file() rather than command-line flags to pass information from
> GN -> write_build_config.py
>  * Creates $target_out_dir/$target_name.params.json files
>  * Reduces the size of .ninja files
>  * Enables auxiliary tools that read .build_config.json files to instead
>    read .params.json, which do not need to be built.
>  * Reduces boiler-plate in write_build_config.py
>
> Other simplifications:
>  * Remove outdated documentation about build_config values
>  * Renamed some build_config.json keys to improve consistency
>  * Moves uncompressed_assets and final_dex_path for bundle modules
>    into the bundle's build_config (so that the module's config is
>    not needed)
>
> I've attempted to update all tools that read .build_config.json files.
>
> build.ninja files: 884650045->878689015 (about 6mb smaller)
> .build_config.json: 285674537->273369616(about 12mb smaller)
>
> Bug: 413331591
> Change-Id: I6d01f4fea04b95a1d3911e0538f0e1a4090a4dcf
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479572
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1451366}

Bug: 413331591, 413429757
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Ia3ef17f7d67babaaea6b14e44c17e8738a4db26a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489352
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451423}
NOKEYCHECK=True
GitOrigin-RevId: 9acd9592e904395600e063d6bbbc541c053e53db
This CL sets default AUTONINJA_BUILD_ID before os.environ.copy() to
set it to `env`.

Bug: 411212902
Change-Id: I1cfe3bd52f7b281898a0de3fd6ac2f0a9dc149b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486976
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1451540}
NOKEYCHECK=True
GitOrigin-RevId: ed7f7a053c0459d2fff2ad9563d61782bb5e0c71
./obj/content/test/content_unittests/auction_runner_unittest.o
and
./obj/v8/v8_compiler/csa-optimize-phase.o

takes ~2min to compile, so if cache misses, it would be likely
deadline exceeded (~2min), and then run locally for fallback (+ ~2min),
so takes ~4min.

Set long timeout to avoid fallback by deadline exceeded.

Bug: 413423339
Change-Id: I6ed338fb7822cef5406d5241b8e43409f2d01c92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6490707
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Philipp Wollermann <philwo@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451620}
NOKEYCHECK=True
GitOrigin-RevId: 4f07eea348fc8782f10e676b8530b1a06f17b8d1
It's no longer needed as of b/389166093... Except for interfaces that
are extended by other interfaces, where it's needed due to a
hard-to-fix quirk in R8 involving synthetic bridges and improper
handling of them by Mockito.

Bug: 389166093
Change-Id: I9100f386f0238e185efbce77f2ebbe3c3c05621d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6378168
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1451832}
NOKEYCHECK=True
GitOrigin-RevId: 3623d157d1d46b96d89fa9321cb3385f500ad59f
This reverts commit 9acd9592e904395600e063d6bbbc541c053e53db.

Reason for revert: Fixed trace_event_rewritten targets

Bug: 413331591, 413429757
Original change's description:
> Revert "Android: Revamp .build_config.json files"
>
> This reverts commit 96f90bea226aad4c34f98e051dc414c06f6171b0.
>
> Reason for revert: Broke trace_event_rewritten target
>
> Bug: 413331591
> Original change's description:
> > Android: Revamp .build_config.json files
> >
> > Use write_file() rather than command-line flags to pass information from
> > GN -> write_build_config.py
> >  * Creates $target_out_dir/$target_name.params.json files
> >  * Reduces the size of .ninja files
> >  * Enables auxiliary tools that read .build_config.json files to instead
> >    read .params.json, which do not need to be built.
> >  * Reduces boiler-plate in write_build_config.py
> >
> > Other simplifications:
> >  * Remove outdated documentation about build_config values
> >  * Renamed some build_config.json keys to improve consistency
> >  * Moves uncompressed_assets and final_dex_path for bundle modules
> >    into the bundle's build_config (so that the module's config is
> >    not needed)
> >
> > I've attempted to update all tools that read .build_config.json files.
> >
> > build.ninja files: 884650045->878689015 (about 6mb smaller)
> > .build_config.json: 285674537->273369616(about 12mb smaller)
> >
> > Bug: 413331591
> > Change-Id: I6d01f4fea04b95a1d3911e0538f0e1a4090a4dcf
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479572
> > Reviewed-by: Peter Wen <wnwen@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1451366}
>
> Bug: 413331591, 413429757
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: Ia3ef17f7d67babaaea6b14e44c17e8738a4db26a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489352
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1451423}

Bug: 413331591
Bug: 413331591, 413429757
Change-Id: I63fcea903945f2b5c0554925e019d92f5d242ba3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6490257
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@{#1451844}
NOKEYCHECK=True
GitOrigin-RevId: a9c9cb734574a2a517dc4fc5518b4338287cc6c8
This reverts commit a9c9cb734574a2a517dc4fc5518b4338287cc6c8.

Reason for revert: https://ci.chromium.org/ui/p/chrome/builders/ci/android-builder-perf/878126/blamelist

Bug: 413331591
Bug: 413331591, 413429757
Original change's description:
> Reland "Android: Revamp .build_config.json files"
>
> This reverts commit 9acd9592e904395600e063d6bbbc541c053e53db.
>
> Reason for revert: Fixed trace_event_rewritten targets
>
> Bug: 413331591, 413429757
> Original change's description:
> > Revert "Android: Revamp .build_config.json files"
> >
> > This reverts commit 96f90bea226aad4c34f98e051dc414c06f6171b0.
> >
> > Reason for revert: Broke trace_event_rewritten target
> >
> > Bug: 413331591
> > Original change's description:
> > > Android: Revamp .build_config.json files
> > >
> > > Use write_file() rather than command-line flags to pass information from
> > > GN -> write_build_config.py
> > >  * Creates $target_out_dir/$target_name.params.json files
> > >  * Reduces the size of .ninja files
> > >  * Enables auxiliary tools that read .build_config.json files to instead
> > >    read .params.json, which do not need to be built.
> > >  * Reduces boiler-plate in write_build_config.py
> > >
> > > Other simplifications:
> > >  * Remove outdated documentation about build_config values
> > >  * Renamed some build_config.json keys to improve consistency
> > >  * Moves uncompressed_assets and final_dex_path for bundle modules
> > >    into the bundle's build_config (so that the module's config is
> > >    not needed)
> > >
> > > I've attempted to update all tools that read .build_config.json files.
> > >
> > > build.ninja files: 884650045->878689015 (about 6mb smaller)
> > > .build_config.json: 285674537->273369616(about 12mb smaller)
> > >
> > > Bug: 413331591
> > > Change-Id: I6d01f4fea04b95a1d3911e0538f0e1a4090a4dcf
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6479572
> > > Reviewed-by: Peter Wen <wnwen@chromium.org>
> > > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1451366}
> >
> > Bug: 413331591, 413429757
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Change-Id: Ia3ef17f7d67babaaea6b14e44c17e8738a4db26a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489352
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1451423}
>
> Bug: 413331591
> Bug: 413331591, 413429757
> Change-Id: I63fcea903945f2b5c0554925e019d92f5d242ba3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6490257
> 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@{#1451844}

Bug: 413331591, 413429757
Bug: 413331591
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Id390eb968d27f44b2ef1d41753c13525caf2e555
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6490036
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1451888}
NOKEYCHECK=True
GitOrigin-RevId: e29eae6dd420460a8e3cb58c9b58b4917f0092de
…vmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1""

This reverts commit d6a3e87dd78d594fea16772006309fa80c41e44b.

Reason for revert: It was reverted because compile error in fuchsia-fyi-x64-dbg-persistent-emulator. I added `-fextend-variable-liveness=none` to fuchsia build to workaround it.

Original change's description:
> Revert "Reland "Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1""
>
> This reverts commit 67678771b7597ff0cee1f87610c5b52b30466412.
>
> Reason for revert:
> LUCI Bisection has identified this change as the culprit of a build failure. See the analysis: https://ci.chromium.org/ui/p/chromium/bisection/compile-analysis/b/8716687820744588913
>
> Sample failed build: https://ci.chromium.org/b/8716687820744588913
>
> If this is a false positive, please report it at http://b.corp.google.com/createIssue?component=1199205&description=Analysis%3A+https%3A%2F%2Fchromium-review.googlesource.com%2Fc%2Fchromium%2Fsrc%2F%2B%2F6486639&format=PLAIN&priority=P3&title=Wrongly+blamed+https%3A%2F%2Fci.chromium.org%2Fui%2Fp%2Fchromium%2Fbisection%2Fcompile-analysis%2Fb%2F8716687820744588913&type=BUG
>
> Original change's description:
> > Reland "Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1"
> >
> > This is a reland of commit 6445cc175e8648371811f11152688ee83fab4c3e
> > The stack overflow which caused the revert has been addressed (see
> > crbug.com/413269096).
> >
> > Original change's description:
> > > Roll clang+rust llvmorg-21-init-6681-g5b36835d-1 : llvmorg-21-init-9266-g09006611-1 / 3f690c2257b7080cd3a8cce64e082fc972148990-1 : c8f94230282a8e8c1148f3e657f0199aad909228-1
> > >
> > > https://chromium.googlesource.com/external/github.com/llvm/llvm-project/+log/5b36835d..09006611
> > >
> > > https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/3f690c2257b7..c8f94230282a
> > >
> > > Ran: ./tools/clang/scripts/upload_revision.py 09006611151c7f85862a9da8da34872c456c2c37
> > >
> > > Bug: 409287490
> > > Change-Id: Iee1fbf94ac025644cba9af666d60eed0bfc99e7f
> > > Tricium: skip
> > > Disable-Rts: True
> > > Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
> > > Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
> > > Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
> > > Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
> > > Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
> > > Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
> > > Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
> > > Cq-Include-Trybots: chromium/try:ios-catalyst,win-asan,android-official
> > > Cq-Include-Trybots: chromium/try:fuchsia-arm64-cast-receiver-rel
> > > Cq-Include-Trybots: chromium/try:mac-official,linux-official
> > > Cq-Include-Trybots: chromium/try:win-official,win32-official
> > > Cq-Include-Trybots: chromium/try:win-arm64-rel
> > > Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
> > > Cq-Include-Trybots: chromium/try:android-cronet-riscv64-dbg
> > > Cq-Include-Trybots: chromium/try:android-cronet-riscv64-rel
> > > Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
> > > Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
> > > Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
> > > Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
> > > Cq-Include-Trybots: luci.chromium.try:linux-cast-x64-rel
> > > Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
> > > Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
> > > Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
> > > Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
> > > Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
> > > Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
> > > Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
> > > Cq-Include-Trybots: chromium/try:win-rust-x64-rel
> > > Binary-Size: Slight arm32 increase (crbug.com/412726016).
> > > Fuchsia-Binary-Size: See above.
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476964
> > > Reviewed-by: Hans Wennborg <hans@chromium.org>
> > > Reviewed-by: Zequan Wu <zequanwu@google.com>
> > > Reviewed-by: Nico Weber <thakis@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1451014}
> >
> > Binary-Size: Slight arm32 increase (crbug.com/412726016).
> > Fuchsia-Binary-Size: See above.
> > Bug: 409287490
> > Change-Id: Ib0b8e3054d2e12eda7a66ab64aefafc660973c3d
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6486639
> > Reviewed-by: Nico Weber <thakis@chromium.org>
> > Commit-Queue: Hans Wennborg <hans@chromium.org>
> > Auto-Submit: Hans Wennborg <hans@chromium.org>
> > Commit-Queue: Nico Weber <thakis@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1451221}
> >
>
> Bug: 409287490
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: Iac412f96dbe52bf3616c9768d29ccba7b50b47a0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489987
> Bot-Commit: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
> Owners-Override: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
> Commit-Queue: luci-bisection@appspot.gserviceaccount.com <luci-bisection@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#1451360}

Binary-Size: Slight arm32 increase (crbug.com/412726016).
Fuchsia-Binary-Size: See above.
Bug: 409287490, 413427035
Change-Id: I0ae69b70a11db37844f66cd796d81ca40ac3a506
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6489115
Reviewed-by: Nico Weber <thakis@chromium.org>
Auto-Submit: Zequan Wu <zequanwu@google.com>
Commit-Queue: Zequan Wu <zequanwu@google.com>
Cr-Commit-Position: refs/heads/main@{#1451998}
NOKEYCHECK=True
GitOrigin-RevId: baa29fd5df8262a9d5aebb9cc3d9d047a39add4c
Having an early `assert` prevents irrelevant/low-level errors later
like the ones pointed out in https://crbug.com/413595081.

Bug: 413595081
Change-Id: I51b3d0c5f873cfa0a0ee8629e0d22b3a1f1ee4da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6492407
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1452250}
NOKEYCHECK=True
GitOrigin-RevId: 15d204f8bf5cc292f592792948823a2bbd77d82c
# Conflicts:
#	config/apple/sdk_info.py
#	config/ios/config.gni
#	config/ios/ios_sdk.gni
#	config/ios/rules.gni
# Start of line, or after /* package */
r'^(?:/\*.*\*/\s*)?'
# Annotations
r'(?:@\w+(?:\(.*\))\s+)*'

Check failure

Code scanning / CodeQL

Inefficient regular expression High

This part of the regular expression may cause exponential backtracking on strings starting with '@a(' and containing many repetitions of ') @a('.
Comment thread fuchsia/test/common.py
# addresses, this is so sockets do not fail to bind for being in the
# CLOSE_WAIT state.
tmp.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
tmp.bind(('', 0))

Check warning

Code scanning / CodeQL

Binding a socket to all network interfaces Medium test

'' binds a socket to all interfaces.

Copilot Autofix

AI 10 months ago

To fix the issue, we will modify the tmp.bind call in the get_free_local_port function to bind the socket to the loopback interface (127.0.0.1) instead of all interfaces (''). This ensures that the socket is only accessible locally, reducing the security risk. The change will be made on line 559 of the file fuchsia/test/common.py.

No additional imports or definitions are required to implement this fix.


Suggested changeset 1
fuchsia/test/common.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/fuchsia/test/common.py b/fuchsia/test/common.py
--- a/fuchsia/test/common.py
+++ b/fuchsia/test/common.py
@@ -558,3 +558,3 @@
     tmp.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    tmp.bind(('', 0))
+    tmp.bind(('127.0.0.1', 0))
     port = tmp.getsockname()[1]
EOF
@@ -558,3 +558,3 @@
tmp.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
tmp.bind(('', 0))
tmp.bind(('127.0.0.1', 0))
port = tmp.getsockname()[1]
Copilot is powered by AI and may make mistakes. Always verify output.
@pblazej pblazej closed this Jun 16, 2025
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
https://crrev.com/c/6599562 refactored the code to support the PRE_
test grouping in gtest. This CL is a followup to keep user data dir
for PRE_ tests in apk-based gtest.

**Note** that PRE_ tests in android_browsertests still don't work
because it uses a different way to setup and clean user data dir,
after the CL https://crrev.com/c/1677591

This CL introduces new intent extra "KeepUserDataDir" in
1. NativeTestInstrumentationTestRunner.
2. NativeTestIntent.

The python code local_device_gtest_run.py sets the extra #1 to true
for a PRE_ test group.

Then NativeTestInstrumentationTestRunner.java consumes this info and
sets the extra #2 for each individual java test shard.

The *BrowserTestActivity.java then read this info, and keep the user
data dir when needed, before running the tests.

This CL also enables NetworkServiceBrowserCacheResetTest in
content_browsertests on android, which contains PRE_ tests

Bug: 40200835
Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
Reviewed-by: Adam Rice <ricea@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1473200}
NOKEYCHECK=True
GitOrigin-RevId: fa6e7b9cd713f3328ace3b15d010eef0207f295e
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
This reverts commit fa6e7b9cd713f3328ace3b15d010eef0207f295e.

Reason for revert: Suspect for test failures; See http://b/424625656

Bug: 40200835, 424625656
Original change's description:
> Android apk-based Gtest: Keep user data dir for PRE_ tests.
>
> https://crrev.com/c/6599562 refactored the code to support the PRE_
> test grouping in gtest. This CL is a followup to keep user data dir
> for PRE_ tests in apk-based gtest.
>
> **Note** that PRE_ tests in android_browsertests still don't work
> because it uses a different way to setup and clean user data dir,
> after the CL https://crrev.com/c/1677591
>
> This CL introduces new intent extra "KeepUserDataDir" in
> 1. NativeTestInstrumentationTestRunner.
> 2. NativeTestIntent.
>
> The python code local_device_gtest_run.py sets the extra #1 to true
> for a PRE_ test group.
>
> Then NativeTestInstrumentationTestRunner.java consumes this info and
> sets the extra #2 for each individual java test shard.
>
> The *BrowserTestActivity.java then read this info, and keep the user
> data dir when needed, before running the tests.
>
> This CL also enables NetworkServiceBrowserCacheResetTest in
> content_browsertests on android, which contains PRE_ tests
>
> Bug: 40200835
> Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
> Reviewed-by: Adam Rice <ricea@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Haiyang Pan <hypan@google.com>
> Cr-Commit-Position: refs/heads/main@{#1473200}

Bug: 40200835
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I61ad6b412ae64a71d6a96d2963cb100351174fba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6641801
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Neil Coronado <nemco@google.com>
Owners-Override: Neil Coronado <nemco@google.com>
Cr-Commit-Position: refs/heads/main@{#1473278}
NOKEYCHECK=True
GitOrigin-RevId: 9f5be0af69b06f431e037468bc82dee9bc68cf4b
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
This is a reland of commit fa6e7b9cd713f3328ace3b15d010eef0207f295e

Fixes: Removed content/browser/network_service_browsertest.cc change.
Will land this in a separate CL.

Original change's description:
> Android apk-based Gtest: Keep user data dir for PRE_ tests.
>
> https://crrev.com/c/6599562 refactored the code to support the PRE_
> test grouping in gtest. This CL is a followup to keep user data dir
> for PRE_ tests in apk-based gtest.
>
> **Note** that PRE_ tests in android_browsertests still don't work
> because it uses a different way to setup and clean user data dir,
> after the CL https://crrev.com/c/1677591
>
> This CL introduces new intent extra "KeepUserDataDir" in
> 1. NativeTestInstrumentationTestRunner.
> 2. NativeTestIntent.
>
> The python code local_device_gtest_run.py sets the extra #1 to true
> for a PRE_ test group.
>
> Then NativeTestInstrumentationTestRunner.java consumes this info and
> sets the extra #2 for each individual java test shard.
>
> The *BrowserTestActivity.java then read this info, and keep the user
> data dir when needed, before running the tests.
>
> This CL also enables NetworkServiceBrowserCacheResetTest in
> content_browsertests on android, which contains PRE_ tests
>
> Bug: 40200835
> Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
> Reviewed-by: Adam Rice <ricea@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Haiyang Pan <hypan@google.com>
> Cr-Commit-Position: refs/heads/main@{#1473200}

Bug: 40200835, 424625656
Change-Id: I8036b000518efc4affdb4656f73e60afdb30020e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6643463
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1474455}
NOKEYCHECK=True
GitOrigin-RevId: b4d1a817faefed922a2556e94d1fceea2adef7a1
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
This reverts commit 95e33c7f5a86dc5a4a574ba73b5d9af9c0fca544.

Reason for reland:
 * Fixed not taking proguard configs from apk_under_test
 * Fixed cronet build (via https://chromium-review.googlesource.com/c/chromium/src/+/6680687)

Bug: 413331591
Original change's description:
> Revert "Reland "Android: Refactor write_build_config.py""
>
> This reverts commit 06d621e852be7ea84d6dfcd251b8f0c33d36a6f4.
>
> Reason for revert: Broke chrome_uiautomator_test_apk
>
> Bug: 413331591
> Original change's description:
> > Reland "Android: Refactor write_build_config.py"
> >
> > This is a reland of commit 814fb1e64612b502875b64e82a95a2ca3a4a5af9
> >
> > Original change's description:
> > > Android: Refactor write_build_config.py
> > >
> > > The main goal is to speed it up by having it read only .params.json
> > > files instead of also needing to read dependent .build_config.json
> > > files.
> > >
> > > There's also a good number of simplifications included, including
> > > fixing lists not always being topologically sorted.
> > >
> > > Running: autoninja --offline $(cat all_build_configs.txt)
> > > Before: 50 seconds
> > > After: 16 seconds
> > >
> > > This removes dependent .build_config files as inputs in most cases,
> > > so improves remote build times.
> > > Running: autoninja $(cat all_build_configs.txt)
> > > Before: 42 seconds
> > > After: 14 seconds
> > >
> > > Bug: 413331591
> > > Change-Id: I58f424ffc14943089b1f7625a417abb586e6fb92
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6639823
> > > 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@{#1478885}
> >
> > Bug: 413331591
> > Change-Id: Ia6ff026573c6cd31b2c3d1c00124237a1abf0230
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6679732
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Sam Maier <smaier@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1479161}
>
> Bug: 413331591
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I0d9c1b2fb1c13a1ef6de722b4f882e7c717477b7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6681268
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#1479260}

Bug: 413331591
Change-Id: Ib5df512c17d40ae066f5500f620bcd74f7495000
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6681467
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Mohannad Farrag <aymanm@google.com>
Reviewed-by: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1479356}
NOKEYCHECK=True
GitOrigin-RevId: 4bc21e8413d1d01f2b1bf474cbb7fa6811b40528
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
This reverts commit 4bc21e8413d1d01f2b1bf474cbb7fa6811b40528.

Change-Id: I5523850ad9fb072919d354d2ab9383feeb8852c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6680571
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1479597}
NOKEYCHECK=True
GitOrigin-RevId: 4f141ffbfc24fe79b6f1d8596212818f12c07fb6
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
This reverts commit 4f141ffbfc24fe79b6f1d8596212818f12c07fb6.

Reason for reland: Fixed missing keys for dist_arr()

Original change's description:
> Revert "Reland #2 "Android: Refactor write_build_config.py""
>
> This reverts commit 4bc21e8413d1d01f2b1bf474cbb7fa6811b40528.
>
> Change-Id: I5523850ad9fb072919d354d2ab9383feeb8852c6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6680571
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Owners-Override: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1479597}

Change-Id: I6cd1ea3edeaeefca9d6d765d9b13b6c7ad54c931
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6681236
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@{#1479826}
NOKEYCHECK=True
GitOrigin-RevId: 8a6674346207b0d060fa98cf2f0eb1008c835e81
cloudwebrtc pushed a commit that referenced this pull request Feb 6, 2026
… APP_BROWSER category"

This CL is the 2nd attempt to reland http://crrev.com/c/7204064.

The 1st attempt to reland the original CL is
http://crrev.com/c/7218816. It failed
"android-automotive-12l-arm64-rel-tests" because that bot runs on
physical Seahawk boards in Headless System User Mode.

In that mode, the system user (User 0) runs in the background, while
the actual "driver" user is usually User 10 (or higher). By default,
many ADB commands target User 0, so when we tried to grant the test APK
the browser role, the ADB command failed as the APK wasn't installed
for User 0.

To fix this, we need to
(1) Find the current user ID using "adb shell am get-current-user";
(2) Bypass role qualification (required for test apps) using
    "adb shell cmd role set-bypassing-role-qualification true";
(3) Grant the browser role to the current user:
    "adb shell cmd role add-role-holder --user <user_id_from_step_1>
     <role> <package>"

This CL applies the above solution on top of the 1st reland CL
(http://crrev.com/c/7218816).

Include-Ci-Only-Tests: true
Validate-Test-Flakiness: skip
Bug: 463735862
Change-Id: I9de540f33328d47dea396609cc519eea9779652c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7229746
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Linyu He <linyuh@google.com>
Cr-Commit-Position: refs/heads/main@{#1554804}
NOKEYCHECK=True
GitOrigin-RevId: 7ffd043b893849164002b8f5f7125e58f3bba543
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.