diff options
| author | Xin Li <delphij@google.com> | 2024-01-29 10:14:54 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-29 10:14:54 -0800 |
| commit | bc99c51aeea17a68ec75c01243b61ef49098453c (patch) | |
| tree | 712a8aca04f15717be05a12c745315795bf88b45 | |
| parent | e41000e6ca5d81c62d97abc7f20834ebc42efd19 (diff) | |
| parent | 552c02262cb2f2aff70ab84af006b995c7f035b7 (diff) | |
| download | grpc-grpc-java-bc99c51aeea17a68ec75c01243b61ef49098453c.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343
Change-Id: I6a9fff4df010c07b2e9213ece8649a8ee857a160
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | okhttp/Android.bp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 03dabc5d4..454497c14 100644 --- a/Android.bp +++ b/Android.bp @@ -83,7 +83,7 @@ java_library { apex_available: [ "com.android.adservices", "com.android.devicelock", - "com.android.extservices", + "com.android.extservices" ], } diff --git a/okhttp/Android.bp b/okhttp/Android.bp index 39bd4f4a6..3505cb48e 100644 --- a/okhttp/Android.bp +++ b/okhttp/Android.bp @@ -54,4 +54,6 @@ java_library { "com.android.devicelock", "com.android.extservices", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } |