aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-10 17:22:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-10 17:22:12 +0000
commit4c47d05f12d29fcb9e2f3f7adaedd012dd505ca9 (patch)
treec73a16dc610c99520a93c2b33b8a4a3d7e64a00f
parentc3f6da7e6510ccb68c55332ba9deee09e714c506 (diff)
parent7a48bd0e55ed4b446aedf4f50a5cd29396d157da (diff)
downloadhamcrest-4c47d05f12d29fcb9e2f3f7adaedd012dd505ca9.tar.gz
Merge "Merge Android R"
-rw-r--r--hamcrest-core/Android.bp5
1 files changed, 5 insertions, 0 deletions
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 @@ java_library_static {
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",
}