diff options
| author | Zi Wang <mrziwang@google.com> | 2023-09-12 00:39:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-12 00:39:58 +0000 |
| commit | 6ee98653ff6f29f40cf6f17a22ca3ec5c679f0ca (patch) | |
| tree | 22eaf8d8542862f35e044690ac617c1662081396 | |
| parent | d3a3880e414ae003ba2e7a0bd6aebc02433895b9 (diff) | |
| parent | 800c932073a85a5e6bddfd75fdb1fc136ad6720d (diff) | |
| download | protobuf-6ee98653ff6f29f40cf6f17a22ca3ec5c679f0ca.tar.gz | |
Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635 am: f72e4c6707 am: 800c932073
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915
Change-Id: I734e37c487195adc39db2aa7e500d0d94b8e51dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 283c9fd25..9ea9e6da2 100644 --- a/Android.bp +++ b/Android.bp @@ -708,6 +708,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": [], |