diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-20 05:37:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-20 05:37:27 +0000 |
| commit | 015410228cad4cbdbd1659813761ccfbc97a70b6 (patch) | |
| tree | 61b74adb648176ffe121e0c9e2070e39ad11f3be | |
| parent | abba824fa0986a4163747c9e5158fd322b1502b3 (diff) | |
| parent | 2657f55badb13d8dd131d2d460682410578a2c3c (diff) | |
| download | grpc-grpc-java-015410228cad4cbdbd1659813761ccfbc97a70b6.tar.gz | |
Snap for 9629443 from 2657f55badb13d8dd131d2d460682410578a2c3c to udc-d1-release
Change-Id: I8b16d5be50e207532309d28515f87bbc22a620fb
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | context/Android.bp | 3 | ||||
| -rw-r--r-- | core/Android.bp | 7 | ||||
| -rw-r--r-- | okhttp/Android.bp | 3 | ||||
| -rw-r--r-- | protobuf-lite/Android.bp | 3 | ||||
| -rw-r--r-- | stub/Android.bp | 3 |
6 files changed, 16 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp index f7a492c7c..afab948e7 100644 --- a/Android.bp +++ b/Android.bp @@ -77,10 +77,11 @@ java_library { "grpc-java-okhttp", ], sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } @@ -97,9 +98,10 @@ java_library { "guava", ], sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } diff --git a/context/Android.bp b/context/Android.bp index 9c7864296..35318638e 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -37,9 +37,10 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } diff --git a/core/Android.bp b/core/Android.bp index f0a8bc208..2ea2f3bd8 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -39,10 +39,11 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } @@ -95,12 +96,12 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], - errorprone: { javacflags: [ "-Xep:BanJNDI:WARN", diff --git a/okhttp/Android.bp b/okhttp/Android.bp index 2938092c4..87012c762 100644 --- a/okhttp/Android.bp +++ b/okhttp/Android.bp @@ -42,9 +42,10 @@ java_library { "okhttp-norepackage", ], sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index e42425c79..22e3fb711 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -38,9 +38,10 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } diff --git a/stub/Android.bp b/stub/Android.bp index 234c90ed2..65c87a9ee 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -38,9 +38,10 @@ java_library { // b/267831518: Pin tradefed and dependencies to Java 11. java_version: "11", sdk_version: "current", - min_sdk_version: "33", + min_sdk_version: "30", apex_available: [ "com.android.adservices", "com.android.devicelock", + "com.android.extservices", ], } |