diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:10:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:10:57 +0000 |
| commit | 9d2442bef1c07338f0bbf0a041b90ed7272c9359 (patch) | |
| tree | 5528ebf957c91068e9541cddad99e9ca57fda535 | |
| parent | 3d93355d400c12246f5ee086094ef95cf5ce15c5 (diff) | |
| parent | 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa (diff) | |
| download | opencensus-java-aml_sdk_341110000.tar.gz | |
Snap for 10453563 from 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa to mainline-sdkext-releaseaml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010android14-mainline-sdkext-release
Change-Id: Ia0b0e9e59362269bb98a002d8a98aed98c2769bd
| -rw-r--r-- | api/Android.bp | 7 | ||||
| -rw-r--r-- | contrib/grpc_metrics/Android.bp | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp index 537d9696..2bc74ad1 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -38,5 +38,12 @@ java_library { "grpc-java-context", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", + min_sdk_version: "33", + apex_available: [ + "//apex_available:platform", + "com.android.devicelock", + ], } diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp index 8770bd62..7184c1ff 100644 --- a/contrib/grpc_metrics/Android.bp +++ b/contrib/grpc_metrics/Android.bp @@ -33,5 +33,12 @@ java_library { "opencensus-java-api", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", + min_sdk_version: "33", + apex_available: [ + "//apex_available:platform", + "com.android.devicelock", + ], } |