From 1ec220e66b528465293bd0fdac22d1f59d81abf1 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Thu, 6 Feb 2020 19:43:25 +0000 Subject: Revert "Pin junit to Java language level 8." The original change was made to support loading this library from an OpenJDK 8 runtime as part of layoutlib. This is no longer required as layoutlib now runs with OpenJDK 11. This reverts commit 2e771a25d8437246287c87d8045794c7f6968ec1. 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: 142116384 Change-Id: I676b21082db284437c33993b133f48d930111ca2 --- Android.bp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 34d70c3..b0e24e5 100644 --- a/Android.bp +++ b/Android.bp @@ -21,11 +21,6 @@ java_library_static { srcs: ["src/main/java/**/*.java"], sdk_version: "core_current", static_libs: ["hamcrest"], - - // 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", } // Legacy junit-host jar until references are updated -- cgit v1.2.3