diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:53 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:53 -0800 |
| commit | 7e8f516426373392cda1e065b9ad5a66fc00d30f (patch) | |
| tree | 67bbd9e1375edbabf230454d12d32bfa773d70ed | |
| parent | 36ff546fab65456d1e44ecbc4479796e4ab87eaf (diff) | |
| parent | c8d15ecf5358c0d3dd286aec071d71599be79ba1 (diff) | |
| download | grpc-grpc-java-7e8f516426373392cda1e065b9ad5a66fc00d30f.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I237c4fe809a79267e8a8eed50e3f2cc2768c7264
Change-Id: I612c1af8861bfac59108aa84d5cfce091e6f5a0e
| -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 aaddf66c1..7b1077c4e 100644 --- a/Android.bp +++ b/Android.bp @@ -84,7 +84,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", } |