Fix up the host build of ICU. It's still failing for me in building the
data file, but this is definitely a step in the right direction.
Change-Id: I6945ab8fd6f4ae3c1b81ae281fbdaf46470f1324
diff --git a/common/Android.mk b/common/Android.mk
index c35a371..0fac457 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -120,6 +120,8 @@
ifeq ($(WITH_HOST_DALVIK),true)
+ include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(src_files)
LOCAL_C_INCLUDES := $(c_includes)
diff --git a/i18n/Android.mk b/i18n/Android.mk
index 699e122..6d966d8 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -81,7 +81,7 @@
LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_I18N_IMPLEMENTATION -fPIC
LOCAL_CFLAGS += -O3
-LOCAL_SHARED_LIBRARIES += libicuuc libicudata
+LOCAL_SHARED_LIBRARIES += libicuuc libicudata
LOCAL_LDLIBS += -lpthread -lm
LOCAL_MODULE := libicui18n
@@ -95,12 +95,14 @@
ifeq ($(WITH_HOST_DALVIK),true)
+ include $(CLEAR_VARS)
+
LOCAL_SRC_FILES := $(src_files)
LOCAL_C_INCLUDES := $(c_includes)
LOCAL_CFLAGS += -D_REENTRANT -DU_I18N_IMPLEMENTATION
- LOCAL_SHARED_LIBRARIES += libicuuc libicudata
+ LOCAL_SHARED_LIBRARIES += libicuuc libicudata
LOCAL_LDLIBS += -lpthread -lm
LOCAL_MODULE := libicui18n
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index d90b40b..01d44da 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -75,7 +75,7 @@
#
-# Japanese
+# Japanese (for target)
#
include $(CLEAR_VARS)
@@ -91,7 +91,7 @@
#
-# Large
+# Large (for target)
#
include $(CLEAR_VARS)
@@ -106,7 +106,7 @@
#
-# Euro
+# Euro (for target)
#
include $(CLEAR_VARS)
@@ -121,7 +121,7 @@
#
-# Default
+# Default (for target)
#
include $(CLEAR_VARS)
@@ -136,7 +136,7 @@
#
-# US
+# US (for target)
#
include $(CLEAR_VARS)
@@ -148,3 +148,25 @@
include $(LOCAL_PATH)/IcuData.mk
include $(BUILD_SHARED_LIBRARY)
+
+
+#
+# Large (for host). This is the only config we support on the host,
+# and you can see the "config" variable being set below for that
+# reason.
+#
+
+ifeq ($(WITH_HOST_DALVIK),true)
+
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := libicudata-large
+
+ config := large
+ required_config := large
+ data_file_name := icudt38l-large.dat
+ output_file_name := icu_data_large.S
+
+ include $(LOCAL_PATH)/IcuData.mk
+ include $(BUILD_HOST_SHARED_LIBRARY)
+
+endif
