diff options
| author | Oleg Shaldybin <olegsh@google.com> | 2023-07-11 18:40:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-11 18:40:11 +0000 |
| commit | 484c987f445a463227b448779db2d6179177e6a3 (patch) | |
| tree | 379dfd90864fea82cf8713438074ee78912464f3 | |
| parent | f9818f1635e3bb58fe4c9774c1e1795a2734067d (diff) | |
| parent | b94a717fb668effd3f245e8c990a621ac08d01f2 (diff) | |
| download | grpc-grpc-java-484c987f445a463227b448779db2d6179177e6a3.tar.gz | |
Merge changes from topic "grpc-java-aosp" into main am: b94a717fb6
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431
Change-Id: I747e63a88a88e55dcbe0bbb1e9fee73b1d1a288a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/Android.bp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index b381a6cdc..03dabc5d4 100644 --- a/Android.bp +++ b/Android.bp @@ -74,6 +74,7 @@ java_library { "grpc-java-context", "grpc-java-core", "grpc-java-core-internal", + "grpc-java-core-util", "grpc-java-protobuf-lite", "grpc-java-okhttp", ], diff --git a/core/Android.bp b/core/Android.bp index 129c3d3d8..b5734509f 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -141,4 +141,11 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", + min_sdk_version: "30", + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + "com.android.extservices", + "//apex_available:platform", + ], } |