diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-07 00:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-07 00:16:04 +0000 |
| commit | 2eb1e762b83c63a5a14ea737e25f299f34002afd (patch) | |
| tree | 5bf7b5b91bc383161c2fb03f23eab3ae513d7f2d | |
| parent | db8df4ae0109f7c4589faa12b3552a7194a03f53 (diff) | |
| parent | 66f13c4c6e63b3c1dc3a1ac0947fb7bc290677e1 (diff) | |
| download | apache-harmony-2eb1e762b83c63a5a14ea737e25f299f34002afd.tar.gz | |
Merge "Pin apache-harmony-tests{,-hostdex} to java_version 1.8"
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -38,6 +38,8 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart junit LOCAL_JAVACFLAGS := $(harmony_test_javac_flags) LOCAL_MODULE := apache-harmony-tests LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt +# Pin java_version until jarjar is certified to support later versions. http://b/72703434 +LOCAL_JAVA_LANGUAGE_VERSION := 1.8 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -49,6 +51,8 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex junit-hostdex LOCAL_JAVACFLAGS := $(harmony_test_javac_flags) LOCAL_MODULE := apache-harmony-tests-hostdex +# Pin java_version until jarjar is certified to support later versions. http://b/72703434 +LOCAL_JAVA_LANGUAGE_VERSION := 1.8 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # HOST_OS == linux |