aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 09:13:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 09:13:35 +0000
commit9e93c8346957977663b545bc8c3118f6b8b27bcd (patch)
tree0d893e9be512e042c0561f26df9a30c54f3d1980
parente380275aa7f4c1884fc01aed46b394eb790b4d00 (diff)
parent10b49a6bafda90d211d0f26ea66c4286079603e8 (diff)
downloadopencensus-java-9e93c8346957977663b545bc8c3118f6b8b27bcd.tar.gz
Pin tradefed dependencies to Java 11 am: 10b49a6bafandroid-u-beta-1-gpl
Original change: https://android-review.googlesource.com/c/platform/external/opencensus-java/+/2419358 Change-Id: I899b762088c1b3800e7c4fdd4aafe27e348d8ed8 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 79e52e17..b4f9716d 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",
}
diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index 21c246d8..931a5055 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",
}