diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 08:24:38 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 08:24:38 +0000 |
| commit | 11aba93c4904d9fd4ea579a0cea5800636433c98 (patch) | |
| tree | dbe5ebb62cdf36798f62cf1dc18f171ffa00674b | |
| parent | fffa6c0610b5af43ff0cfd28612bd7cb669c388f (diff) | |
| parent | 2792f6b7da5f8b4471acb13665a2c8b0eac23f0e (diff) | |
| download | icu-11aba93c4904d9fd4ea579a0cea5800636433c98.tar.gz | |
Snap for 4593582 from 2792f6b7da5f8b4471acb13665a2c8b0eac23f0e to pi-release
Change-Id: I1a3f7ed53a1ac0bd428bf5abbf5761ad4c94975b
| -rw-r--r-- | icu4j/Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/icu4j/Android.mk b/icu4j/Android.mk index 7ce36e036..ec9d5a06f 100644 --- a/icu4j/Android.mk +++ b/icu4j/Android.mk @@ -136,10 +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) |