commit c24f6249abf1583a60f7b33ea29e321e8f15c586
author Pete Gillin <peteg@google.com> Fri Oct 04 10:08:39 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 04 10:08:39 2019 +0000
tree 42c31af4e0e14d24801abaf2e457e14d65ed2dee
parent a7a4441c288c747f75c88cb07ae0e306494fa1ff
parent f56998f296c67496d433b4f18c5080cb82be9dd9

Merge "Pin hamcrest-core to Java language level 8."

hamcrest-core/Android.bp

diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index da980d8..6cb02ce 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -20,4 +20,9 @@
     hostdex: true,
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
+
+    // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
+    // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
+    // See b/141970724.
+    java_version: "1.8",
 }