diff options
| author | Zi Wang <mrziwang@google.com> | 2023-09-07 15:43:08 -0700 |
|---|---|---|
| committer | Zi Wang <mrziwang@google.com> | 2023-09-07 15:43:08 -0700 |
| commit | 87050d55e3412b2f7968f35906e4f9eeabaaca5f (patch) | |
| tree | 3f224c69e5eea8905a266a3c3f0d810c12081fa2 | |
| parent | bd4496b5ef88e655d6e63a80fb0428f55f476366 (diff) | |
| download | protobuf-87050d55e3412b2f7968f35906e4f9eeabaaca5f.tar.gz | |
Add filegroup for libprotobuf-java-full java srcs
so that we can stop using glob, which causes error when building it.
Test: CI
Bug: 299290824
Change-Id: I713b8fbfa8498c6ed5c8791c88549269bc325eba
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | BUILD.bazel | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index ab335caf6..e4e3b2894 100644 --- a/Android.bp +++ b/Android.bp @@ -707,6 +707,12 @@ filegroup { } filegroup { + name: "libprotobuf-internal-java-full-srcs", + srcs: ["java/core/src/main/java/**/*.java"], + path: "java", +} + +filegroup { name: "libprotobuf-internal-protos", srcs: [ "src/google/protobuf/descriptor.proto", diff --git a/BUILD.bazel b/BUILD.bazel index 5f7c4e519..10f2a5d7c 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -65,7 +65,21 @@ proto_library( java_library( name = "libprotobuf-java-full", java_version = "1.7", - srcs = glob(["java/core/src/main/java/**/*.java"]) + [":libprotobuf-java-full_proto_gen"], + srcs = [ + ":libprotobuf-internal-java-full-srcs", + ":libprotobuf-java-full_proto_gen", + ], + target_compatible_with = select({ + "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//conditions:default": [], + }), +) + +java_library( + name = "libprotobuf-java-full-neverlink", + exports = [":libprotobuf-java-full"], + java_version = "1.7", + neverlink = True, target_compatible_with = select({ "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], |