Merge "Change libraries needed by layoutlib to "host" libs"
diff --git a/icu4j/Android.mk b/icu4j/Android.mk
index cf521fe..6099d2f 100644
--- a/icu4j/Android.mk
+++ b/icu4j/Android.mk
@@ -134,18 +134,16 @@
# LayoutLib (frameworks/base/tools/layoutlib) needs JarJar'd versions of the
# icudata and icutzdata, so add rules for it.
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icudata
+LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icudata-host
LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt
-LOCAL_JACK_ENABLED := disabled
-LOCAL_MODULE := icu4j-icudata-jarjar
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_MODULE := icu4j-icudata-host-jarjar
+include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icutzdata
+LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icutzdata-host
LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt
-LOCAL_JACK_ENABLED := disabled
-LOCAL_MODULE := icu4j-icutzdata-jarjar
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_MODULE := icu4j-icutzdata-host-jarjar
+include $(BUILD_HOST_JAVA_LIBRARY)
# build repackaged ICU tests
#
