diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-07 18:57:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-07 18:57:34 +0000 |
| commit | 2792f6b7da5f8b4471acb13665a2c8b0eac23f0e (patch) | |
| tree | dbe5ebb62cdf36798f62cf1dc18f171ffa00674b | |
| parent | 11148114e85729ee4a784711525e3bc9ad25feba (diff) | |
| parent | 91f060cfdb3eb8b3e1af8f992ad82564dea22f88 (diff) | |
| download | icu-2792f6b7da5f8b4471acb13665a2c8b0eac23f0e.tar.gz | |
Pin jarjar'ed icu targets to java_version 1.8 am: b3db89a265 am: 0e371a3b80
am: 91f060cfdb
Change-Id: Ibdfa29e023350034c49552fe6e0f0a815839f914
| -rw-r--r-- | icu4j/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/icu4j/Android.mk b/icu4j/Android.mk index 8a664bd98..ec9d5a06f 100644 --- a/icu4j/Android.mk +++ b/icu4j/Android.mk @@ -136,16 +136,22 @@ include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icudata-host LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt LOCAL_MODULE := icu4j-icudata-host-jarjar +# Pin java_version until jarjar is certified to support later versions. http://b/72703434 +LOCAL_JAVA_LANGUAGE_VERSION := 1.8 include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icudata LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt LOCAL_MODULE := icu4j-icudata-jarjar +# Pin java_version until jarjar is certified to support later versions. http://b/72703434 +LOCAL_JAVA_LANGUAGE_VERSION := 1.8 include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icutzdata-host LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt LOCAL_MODULE := icu4j-icutzdata-host-jarjar +# Pin java_version until jarjar is certified to support later versions. http://b/72703434 +LOCAL_JAVA_LANGUAGE_VERSION := 1.8 include $(BUILD_HOST_JAVA_LIBRARY) |