diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2020-02-06 19:43:25 +0000 |
|---|---|---|
| committer | Jerome Gaillard <jgaillard@google.com> | 2020-02-20 16:48:59 +0000 |
| commit | 1ec220e66b528465293bd0fdac22d1f59d81abf1 (patch) | |
| tree | c61186255f67ad2936ec4f3fbf77851bd5ab1100 | |
| parent | 2e771a25d8437246287c87d8045794c7f6968ec1 (diff) | |
| download | junit-1ec220e66b528465293bd0fdac22d1f59d81abf1.tar.gz | |
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
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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 |