diff options
| author | Zi Wang <mrziwang@google.com> | 2023-09-11 22:50:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-09-11 22:50:40 +0000 |
| commit | 9a75a3d63509ed634a2730fead8a89a5c6e167aa (patch) | |
| tree | 3f224c69e5eea8905a266a3c3f0d810c12081fa2 | |
| parent | 58a2accc85ce86961849c3327352b538616c5038 (diff) | |
| parent | 87050d55e3412b2f7968f35906e4f9eeabaaca5f (diff) | |
| download | protobuf-9a75a3d63509ed634a2730fead8a89a5c6e167aa.tar.gz | |
Merge changes from topic "libprotobuf-java-full" into main
* changes:
Add filegroup for libprotobuf-java-full java srcs
Add handcrafted libprotobuf-java-full
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | BUILD.bazel | 30 |
2 files changed, 36 insertions, 0 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 8a9ebf78b..10f2a5d7c 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -16,6 +16,7 @@ # from Android.bp. The BUILD file in this folder is unused, it's from # the protocol-buffers github repo. load("//build/bazel/rules/python:py_proto.bzl", "py_proto_library") +load("//build/bazel/rules/java:proto.bzl", "java_proto_sources_gen") py_library( name = "libprotobuf-python", @@ -60,3 +61,32 @@ proto_library( srcs = ["src/" + f + ".proto" for f in proto_filenames], strip_import_prefix = "src", ) + +java_library( + name = "libprotobuf-java-full", + java_version = "1.7", + 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": [], + }), +) + +java_proto_sources_gen( + name = "libprotobuf-java-full_proto_gen", + deps = [":libprotobuf-internal-protos_proto"], +) |