aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2023-02-09 09:51:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 09:51:44 +0000
commit2eed972bc024b7a6264cacd77eef89ebd4acdd2a (patch)
treef27995da9a799be32a093f5f0c4188fc5ad4fbb0
parente600f2213f0bbf4d7a55fb578a1cf61b05b1da17 (diff)
parent5191fc1bba81133fba1dbc2cff349fac27c2e7b8 (diff)
downloadguava-2eed972bc024b7a6264cacd77eef89ebd4acdd2a.tar.gz
Merge "Pin tradefed dependencies to Java 11" am: f3403d8b9b am: 5191fc1bba
Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2419209 Change-Id: Ib49c1a6a974405fb93e290fbd9758e26edbfbe96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d6d95cfb2..d4944233f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -162,6 +162,8 @@ java_host_for_device {
java_library {
name: "guava-android-annotation-stubs",
host_supported: true,
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "core_current",
srcs: ["android-annotation-stubs/src/**/*.java"],
}