diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2020-02-06 19:44:23 +0000 |
|---|---|---|
| committer | Jerome Gaillard <jgaillard@google.com> | 2020-02-20 16:43:54 +0000 |
| commit | a364b2f948dbe1c89a71597494370f006358fcb6 (patch) | |
| tree | 6c90a429a57426c472433dbca7556ef880b1643a | |
| parent | c24f6249abf1583a60f7b33ea29e321e8f15c586 (diff) | |
| download | hamcrest-a364b2f948dbe1c89a71597494370f006358fcb6.tar.gz | |
Revert "Pin hamcrest-core 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 f56998f296c67496d433b4f18c5080cb82be9dd9.
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: If5a3c02a37d7a613be7c10f468efd36482a4ace2
| -rw-r--r-- | hamcrest-core/Android.bp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp index 6cb02ce..da980d8 100644 --- a/hamcrest-core/Android.bp +++ b/hamcrest-core/Android.bp @@ -20,9 +20,4 @@ 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", } |