diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:17:08 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:17:08 +0000 |
commit | 243b3040f96395f2e2cc858c7af56b43f5ee4934 (patch) | |
tree | 5528ebf957c91068e9541cddad99e9ca57fda535 | |
parent | 9da42b7cdb6efd375ca9e39381e6a00897f0d44b (diff) | |
parent | 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa (diff) | |
download | opencensus-java-aml_net_341310020.tar.gz |
Snap for 10447354 from 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa to mainline-networking-releaseaml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000android14-mainline-networking-release
Change-Id: I4c160f034ab59dae3c92ca8d69864f6a033f6961
-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", + ], } |