tree 2d9d20070f5ee81370c61118973e9e64a22fdcb1
parent efbff0aa9fa3ee58105d74d23d93d3c227809fc3
author Yun Peng <pcloudy@google.com> 1704799333 +0100
committer GitHub <noreply@github.com> 1704799333 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJlnSx0CRBK7hj4Ov3rIwAAI/UIAAfZCRc5xy+NoNn/qsYn9dI+
 G4PPUeLP5DAvtu2nMqmV7+u9NnYaKzP4x9ddx3pbzMOYaTsxmHSFcI7zCGhgcE1c
 vcnQgEpEfVNgJnWc/l1kZzC74tj5jQz0DlNdxvO11fOWDL9M4ANl4CAWxtChnvNk
 l+5mynuutca5x1ZKtblH3W553dHZ0WJoCHQV4NKigJbhZ6vfNMt4KClxT/U0G7WR
 KXgi1HxNT1BybmttB7Luy3X+zumuVFvVUV36g45hrHlz9x9hNTh2vB/kBEk2ILlp
 IqQ+z48zdWHwTUTjEb8pgT9nYRQBs6bXwJo1u5fBNq4xpQI5cktxWK0CdKsXbxs=
 =BQ8H
 -----END PGP SIGNATURE-----
 

[6.5.0] Fix bootstrapped Bazel binary (#20804)

For the bootstrap VanillaJavaBuilder, it is important that the AutoValue
plugin classes do not end up in the deploy jar. If they do, the
processor class is loaded from the app classloader (instead of the
processor path classloader). When this happens, AutoValueProcessor uses
the app classloader to load extensions (such as auto-value-gson needed
by bzlmod), instead of the processor path classloader. Unless all
extensions are also correctly present in the app classloder (i.e. in the
VanillaJavaBuilder deploy jar), they won't be loaded.

Unfortunately, simply adding the jars to the deploy jar is insufficient,
we need to also correctly merge the `META-INF/service/...` files as
well, which does not happen in our bootstrap java_binary/java_library
rules. So, to fix, we remove the auto value plugins from the deploy jar,
and use them only to compile our sources that require them.

Added a regression test for the crash. We should probably improve it so
that we can actually build with the bootstapped Bazel in tests without
network access. But I don't think we need block this patch release on
that.

Fixes https://github.com/bazelbuild/bazel/issues/20501

PiperOrigin-RevId: 592266992
Change-Id: I08ac91ee74140df0c4f22ad2553a8c017b497181

Co-authored-by: Googler <hvd@google.com>