commit 2b0f228fb20fe691f1e80f2d1570c39bdabab2aa
author Sorin Basca <sorinbasca@google.com> Thu Feb 09 10:42:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 09 10:42:06 2023 +0000
tree 5528ebf957c91068e9541cddad99e9ca57fda535
parent bf65b3cf7f9e1dfe65271267e99fbcab34cdcce1
parent f89a845c40aaaa687aff3475854d3cfbdfbeec0c

Pin tradefed dependencies to Java 11 am: 10b49a6baf am: 9e93c83469 am: f89a845c40

Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2419358

Change-Id: Ifcef5d4a23b3386debcc72ea3071e34c916d170a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index b4f9716..2bc74ad 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -42,4 +42,8 @@
     java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.devicelock",
+    ],
 }

contrib/grpc_metrics/Android.bp

diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index 931a505..7184c1f 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -37,4 +37,8 @@
     java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.devicelock",
+    ],
 }