From f56998f296c67496d433b4f18c5080cb82be9dd9 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Thu, 3 Oct 2019 17:05:39 +0100 Subject: Pin hamcrest-core to Java language level 8. These jars are loaded by an OpenJDK 8 runtime from prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh so the upcoming change of the platform default to Java language level 9 will break those tests. This change can be reverted if/when prebuilts/studio/jdk is upgraded to OpenJDK 9+. Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make layoutlib layoutlib-tests sdk libandroid_runtime Test: frameworks/layoutlib/bridge/tests/run_tests.sh out/layoutlib-failures Bug: 141970724 Change-Id: I2369718c694f7c3f739dfae426aba5962892e53b --- hamcrest-core/Android.bp | 5 +++++ 1 file changed, 5 insertions(+) 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", } -- cgit v1.2.3