diff options
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | annotation-stubs/Android.bp | 2 | ||||
| -rw-r--r-- | auth/Android.bp | 2 | ||||
| -rw-r--r-- | context/Android.bp | 5 | ||||
| -rw-r--r-- | core/Android.bp | 15 | ||||
| -rw-r--r-- | okhttp/Android.bp | 3 | ||||
| -rw-r--r-- | protobuf-lite/Android.bp | 5 | ||||
| -rw-r--r-- | protobuf/Android.bp | 2 | ||||
| -rw-r--r-- | stub/Android.bp | 5 | ||||
| -rw-r--r-- | testing/Android.bp | 2 |
10 files changed, 38 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp index c72331a88..aa7d9c767 100644 --- a/Android.bp +++ b/Android.bp @@ -63,11 +63,6 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: [ - "//packages/modules/Bluetooth/pandora/interfaces", - "//packages/modules/Bluetooth/android/pandora/server", - "//external/pandora/bt-test-interfaces", - ], } java_library { @@ -82,16 +77,16 @@ 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", ], } java_library { name: "grpc-java-core-android", - host_supported: true, srcs: [ "android/src/main/java/io/grpc/android/*.java", ], @@ -102,9 +97,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/annotation-stubs/Android.bp b/annotation-stubs/Android.bp index 2f1c39c1b..f22fb103a 100644 --- a/annotation-stubs/Android.bp +++ b/annotation-stubs/Android.bp @@ -29,6 +29,8 @@ java_library { ":grpc-java-annotation-stubs-srcjar", ], sdk_version: "current", + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } gensrcs { diff --git a/auth/Android.bp b/auth/Android.bp index 6d0b6b2a4..50437c5b7 100644 --- a/auth/Android.bp +++ b/auth/Android.bp @@ -33,4 +33,6 @@ java_library_host { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } diff --git a/context/Android.bp b/context/Android.bp index 30023005c..35318638e 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -34,10 +34,13 @@ java_library { "guava", "jsr305", ], + // 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 18e93692d..2ea2f3bd8 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -36,11 +36,14 @@ java_library { "jsr305", "guava", ], + // 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", ], } @@ -57,6 +60,8 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } @@ -88,13 +93,15 @@ 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", @@ -114,5 +121,7 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } 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 20d1b10b1..22e3fb711 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -35,10 +35,13 @@ java_library { "jsr305", "libprotobuf-java-lite", ], + // 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/protobuf/Android.bp b/protobuf/Android.bp index f51c27200..4f10a5ee7 100644 --- a/protobuf/Android.bp +++ b/protobuf/Android.bp @@ -38,4 +38,6 @@ java_library_host { "libprotobuf-java-full", "libprotobuf-java-util-full", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } diff --git a/stub/Android.bp b/stub/Android.bp index 2858459e2..65c87a9ee 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -35,10 +35,13 @@ java_library { "guava", "jsr305", ], + // 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/testing/Android.bp b/testing/Android.bp index 2d2a1c6d4..11595de5c 100644 --- a/testing/Android.bp +++ b/testing/Android.bp @@ -45,4 +45,6 @@ java_library { "junit", ], sdk_version: "current", + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } |