diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-14 22:38:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-14 22:38:29 +0000 |
| commit | 13e4719e1a36da4ffe406e4545ee2b1694a8da4f (patch) | |
| tree | fc2479fd64f2dae0b79fdb82b64def3778d002ff | |
| parent | f4787df52bc932ceb8421856868da793afa4bd51 (diff) | |
| parent | 762e56c958fb4e4c6189f93dc6ecd916c78f1c3b (diff) | |
| download | hamcrest-master.tar.gz | |
Merge "Pin tradefed dependencies to Java 11" am: 6b7b9f4611 am: 33a69c97a8 am: 762e56c958HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/2419112
Change-Id: I46c5a70b70390a66acb385406b9edd9e0e44d76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | hamcrest-core/Android.bp | 2 |
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", } |