diff options
| author | 2015-05-13 14:58:15 -0700 | |
|---|---|---|
| committer | 2015-05-13 18:15:32 -0700 | |
| commit | eca056926a5acacbd1fe6b144df2d2952dc4a86e (patch) | |
| tree | 99e383966d6e06cf9d7b09ffca941a88e83f392c /tools/layoutlib/Android.mk | |
| parent | d77b9ed7dcc42efca33b225c4594a30aab9e709c (diff) | |
Load ICU data in LayoutLib
Also return the correct version numbers for ICU data.
Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
Diffstat (limited to 'tools/layoutlib/Android.mk')
| -rw-r--r-- | tools/layoutlib/Android.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 9300401aa2b5..a0bfe624645a 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -37,6 +37,12 @@ built_ext_dep := $(call java-lib-deps,ext) 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 @@ $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(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 @@ $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(built_core_classes) \ $(built_framework_classes) \ $(built_ext_classes) \ + $(built_icudata_data) \ + $(built_icutzdata_data) \ $(built_ext_data) $(hide) ls -l $(built_framework_classes) |