diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:52:16 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:52:16 +0000 |
commit | 16b883ed9e763e8b7240a5d3ff29792c7fe3f124 (patch) | |
tree | 5528ebf957c91068e9541cddad99e9ca57fda535 | |
parent | af9a798b0829dabb49dfb4a37d239d7010deca1b (diff) | |
parent | 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa (diff) | |
download | opencensus-java-aml_ips_341611000.tar.gz |
Snap for 10453563 from 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa to mainline-ipsec-releaseaml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000
Change-Id: I565d29fba7c85ef88ef2c9784a2c7aaf5632b0bd
-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", + ], } |