diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 00:06:47 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 00:06:47 +0000 |
commit | 4e72ae2b4f1b476e3315688ddb23d21b5f097a98 (patch) | |
tree | 67bbd9e1375edbabf230454d12d32bfa773d70ed | |
parent | b34d04558a6ee6996e7b3eb61581e61b69a34e8a (diff) | |
parent | 3076fa6b17b2cd963e8d5e05be3a3396dd8a31be (diff) | |
download | grpc-grpc-java-android14-qpr3-s2-release.tar.gz |
Snap for 11392706 from 3076fa6b17b2cd963e8d5e05be3a3396dd8a31be to 24Q2-releaseandroid-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android14-qpr3-s2-releaseandroid14-qpr3-release
Change-Id: I0ebc927d3361d3e9b381e38c00b8201160ffe347
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | services/Android.bp | 56 |
2 files changed, 21 insertions, 36 deletions
diff --git a/Android.bp b/Android.bp index 454497c14..7b1077c4e 100644 --- a/Android.bp +++ b/Android.bp @@ -48,6 +48,7 @@ java_library_host { "grpc-java-core-util", "grpc-java-protobuf", "grpc-java-protobuf-lite", + "grpc-java-reflection", "grpc-java-stub", ], } diff --git a/services/Android.bp b/services/Android.bp index 276de0c29..f599aeb57 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -14,65 +14,49 @@ // package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_grpc-grpc-java_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: ["external_grpc-grpc-java_license"], } -java_genrule { - name: "grpc-reflection-proto-gen", - srcs: [ - "src/main/proto/grpc/reflection/v1alpha/reflection.proto", - ], - tools: [ - "aprotoc", - "protoc-gen-grpc-java-plugin", - "soong_zip", - ], - cmd: "$(location aprotoc) -Iexternal/protobuf/src" + - " -Iexternal/grpc-grpc-java/services/src/main/proto" + - " --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-java-plugin) $(in)" + - " --grpc_out=lite:$(genDir) --java_out=lite:$(genDir)" + - " && $(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", - out: ["grpc-reflection-proto.srcjar"], -} - java_library_static { - name: "grpc-reflection-lib", - srcs: [ - ":grpc-reflection-proto-gen", - ], - static_libs: [ - "grpc-java-okhttp-client-lite", - "libprotobuf-java-lite", - "javax_annotation-api_1.3.2", - ], + name: "grpc-java-reflection-proto", host_supported: true, device_supported: false, - libs: [ - "guava", + srcs: [ + "src/main/proto/grpc/reflection/v1alpha/reflection.proto", ], - sdk_version: "current", + proto: { + include_dirs: ["external/protobuf/src"], + }, + visibility: ["//visibility:private"], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } java_library_host { name: "grpc-java-reflection", srcs: [ "src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java", + "src/main/proto/grpc/reflection/v1alpha/reflection.proto", + ], + proto: { + include_dirs: ["external/protobuf/src"], + plugin: "grpc-java-plugin", + output_params: ["lite"], + }, + static_libs: [ + "grpc-java-reflection-proto", ], libs: [ "grpc-java-api", "grpc-java-core", "grpc-java-context", "grpc-java-protobuf", + "grpc-java-protobuf-lite", "grpc-java-stub", "guava", + "javax_annotation-api_1.3.2", "jsr305", "libprotobuf-java-util-full", - "grpc-reflection-lib", ], // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", |