diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-10 05:07:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-10 05:07:23 +0000 |
| commit | 22013db5be1378c18fce1afd90d8cada386f0463 (patch) | |
| tree | e18ae18ad0442c7083aeb650fe9c1382549d6fd7 | |
| parent | 56d3c184520e1dc7c5e2296e9b6bb8dc8dee2f19 (diff) | |
| parent | a64efd6587b47f861159964b7ded994b0ad030a9 (diff) | |
| download | grpc-grpc-java-22013db5be1378c18fce1afd90d8cada386f0463.tar.gz | |
Snap for 9588689 from a64efd6587b47f861159964b7ded994b0ad030a9 to udc-d1-release
Change-Id: I17d3b8e12343ffedea5016a8ee09b62dce68fc0b
| -rw-r--r-- | annotation-stubs/Android.bp | 2 | ||||
| -rw-r--r-- | auth/Android.bp | 2 | ||||
| -rw-r--r-- | context/Android.bp | 2 | ||||
| -rw-r--r-- | core/Android.bp | 8 | ||||
| -rw-r--r-- | protobuf-lite/Android.bp | 2 | ||||
| -rw-r--r-- | protobuf/Android.bp | 2 | ||||
| -rw-r--r-- | stub/Android.bp | 2 | ||||
| -rw-r--r-- | testing/Android.bp | 2 |
8 files changed, 22 insertions, 0 deletions
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..9c7864296 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -34,6 +34,8 @@ java_library { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: [ diff --git a/core/Android.bp b/core/Android.bp index 18e93692d..f0a8bc208 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -36,6 +36,8 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: [ @@ -57,6 +59,8 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } @@ -88,6 +92,8 @@ java_library { ], }, }, + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: [ @@ -114,5 +120,7 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index 20d1b10b1..e42425c79 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -35,6 +35,8 @@ 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", apex_available: [ 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..234c90ed2 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -35,6 +35,8 @@ java_library { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: [ 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", } |