aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 10:42:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 10:42:06 +0000
commit2b0f228fb20fe691f1e80f2d1570c39bdabab2aa (patch)
tree5528ebf957c91068e9541cddad99e9ca57fda535
parentbf65b3cf7f9e1dfe65271267e99fbcab34cdcce1 (diff)
parentf89a845c40aaaa687aff3475854d3cfbdfbeec0c (diff)
downloadopencensus-java-2b0f228fb20fe691f1e80f2d1570c39bdabab2aa.tar.gz
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>
-rw-r--r--api/Android.bp2
-rw-r--r--contrib/grpc_metrics/Android.bp2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp
index 5157f4ba..2bc74ad1 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -38,6 +38,8 @@ 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: [
diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index ace48280..7184c1ff 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -33,6 +33,8 @@ 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: [