aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-24 18:20:16 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-24 18:20:16 +0000
commitbc4199e6ad457f66d1e6ac31479bae631b994051 (patch)
tree0d893e9be512e042c0561f26df9a30c54f3d1980
parent61673fde38876be19856185dc554b3611d9cebff (diff)
parent10b49a6bafda90d211d0f26ea66c4286079603e8 (diff)
downloadopencensus-java-bc4199e6ad457f66d1e6ac31479bae631b994051.tar.gz
Snap for 9652768 from 10b49a6bafda90d211d0f26ea66c4286079603e8 to simpleperf-release
Change-Id: I6e8e02cbf7afe07b72c1e22d30f443b693db5c65
-rw-r--r--api/Android.bp3
-rw-r--r--contrib/grpc_metrics/Android.bp3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp
index 537d9696..b4f9716d 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -38,5 +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 8770bd62..931a5055 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -33,5 +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",
}