diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-02 13:01:08 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-02 13:01:08 +0000 |
| commit | d518a0e533babd2af35d2e309c5c4fc63aae43d4 (patch) | |
| tree | ab0a1d7bfff92fc2c14bbcd9bcbc4036ef68e748 | |
| parent | 2d38c3cee6f89f5d078db0d5f1ec3d9027ee09e8 (diff) | |
| parent | 2331c487a3285a8e0737f58d98ea2a8fb1e743fa (diff) | |
| download | grpc-grpc-java-d518a0e533babd2af35d2e309c5c4fc63aae43d4.tar.gz | |
Snap for 9247172 from 2331c487a3285a8e0737f58d98ea2a8fb1e743fa to mainline-art-release
Change-Id: Id95fc66d97eac78598c2e98e5388ba4396e37fa8
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | context/Android.bp | 2 | ||||
| -rw-r--r-- | core/Android.bp | 4 | ||||
| -rw-r--r-- | okhttp/Android.bp | 2 | ||||
| -rw-r--r-- | protobuf-lite/Android.bp | 2 | ||||
| -rw-r--r-- | stub/Android.bp | 2 |
6 files changed, 32 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 5a37d3779..1bff084c5 100644 --- a/Android.bp +++ b/Android.bp @@ -78,4 +78,24 @@ java_library { "grpc-java-okhttp", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } + +java_library { + name: "grpc-java-core-android", + host_supported: true, + srcs: [ + "android/src/main/java/io/grpc/android/*.java", + ], + libs: [ + "grpc-java-core", + "grpc-java-core-internal", + "jsr305", + "guava", + ], + sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], +} + diff --git a/context/Android.bp b/context/Android.bp index 814b17a74..98408708f 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -35,4 +35,6 @@ java_library { "jsr305", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/core/Android.bp b/core/Android.bp index d563293c8..aefe2a9ca 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -37,6 +37,8 @@ java_library { "guava", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } java_library { @@ -84,6 +86,8 @@ java_library { }, }, sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } java_library { diff --git a/okhttp/Android.bp b/okhttp/Android.bp index 7212a3f57..35d4dc247 100644 --- a/okhttp/Android.bp +++ b/okhttp/Android.bp @@ -42,4 +42,6 @@ java_library { "okhttp-norepackage", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index 2a2ed945c..983b09421 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -36,4 +36,6 @@ java_library { "libprotobuf-java-lite", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/stub/Android.bp b/stub/Android.bp index 466195dcf..dbd3a7b38 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -36,4 +36,6 @@ java_library { "jsr305", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } |