aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-02-14 20:41:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-14 20:41:48 +0000
commit762e56c958fb4e4c6189f93dc6ecd916c78f1c3b (patch)
treefc2479fd64f2dae0b79fdb82b64def3778d002ff
parentf4787df52bc932ceb8421856868da793afa4bd51 (diff)
parent33a69c97a8b5d53d2f3b9835ebae53c81cc1dd04 (diff)
downloadhamcrest-762e56c958fb4e4c6189f93dc6ecd916c78f1c3b.tar.gz
Merge "Pin tradefed dependencies to Java 11" am: 6b7b9f4611 am: 33a69c97a8
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/2419112 Change-Id: I210c79e172ebf9465574b30b7957182eb4a78bf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--hamcrest-core/Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index 1183db1..8631726 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -28,5 +28,7 @@ java_library_static {
host_supported: true,
hostdex: true,
srcs: ["src/main/java/**/*.java"],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "core_current",
}