commit 0599fcf05571b51d3dfb894cd71c5f97c39c45e4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Feb 10 02:12:09 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Feb 10 02:12:09 2023 +0000
tree 5528ebf957c91068e9541cddad99e9ca57fda535
parent 992cb647fce86988fb675ab75f247325a55e3085
parent 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa

Snap for 9586404 from 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa to udc-release

Change-Id: I23bd53f5ce69f4c54aef803f5829998e6ddfb6e4

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index 5157f4b..2bc74ad 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -38,6 +38,8 @@
         "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: [

contrib/grpc_metrics/Android.bp

diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index ace4828..7184c1f 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -33,6 +33,8 @@
         "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: [