Load ICU data in LayoutLib
Also return the correct version numbers for ICU data.
Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
diff --git a/Android.mk b/Android.mk
index 9300401..a0bfe62 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,12 @@
built_ext_classes := $(call java-lib-files,ext)
built_ext_data := $(call intermediates-dir-for, \
JAVA_LIBRARIES,ext,,COMMON)/javalib.jar
+built_icudata_dep := $(call java-lib-deps,icu4j-icudata-jarjar)
+built_icudata_data := $(call intermediates-dir-for, \
+ JAVA_LIBRARIES,icu4j-icudata-jarjar,,COMMON)/javalib.jar
+built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-jarjar)
+built_icutzdata_data := $(call intermediates-dir-for, \
+ JAVA_LIBRARIES,icu4j-icutzdata-jarjar,,COMMON)/javalib.jar
built_layoutlib_create_jar := $(call intermediates-dir-for, \
JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar
@@ -56,6 +62,8 @@
$(built_framework_dep) \
$(built_ext_dep) \
$(built_ext_data) \
+ $(built_icudata_dep) \
+ $(built_icutzdata_dep) \
$(built_layoutlib_create_jar)
$(hide) echo "host layoutlib_create: $@"
$(hide) mkdir -p $(dir $@)
@@ -66,6 +74,8 @@
$(built_core_classes) \
$(built_framework_classes) \
$(built_ext_classes) \
+ $(built_icudata_data) \
+ $(built_icutzdata_data) \
$(built_ext_data)
$(hide) ls -l $(built_framework_classes)