diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-31 21:33:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-31 21:33:31 +0000 |
| commit | 3f2e7369368b1ee4658a1ac10939fcc6a34889d4 (patch) | |
| tree | 3b691014dd7be7ab57437dfc0c53ae3156c8b254 | |
| parent | ead5c69ec7085705cf663dd521d7703e0c90a219 (diff) | |
| parent | d70c0d2e019962c7d41fad6a0369cc2bf6c5aed8 (diff) | |
| download | icu4c-3f2e7369368b1ee4658a1ac10939fcc6a34889d4.tar.gz | |
Merge "Ensure that we copy the host .dat file."
| -rw-r--r-- | common/Android.mk | 16 | ||||
| -rw-r--r-- | i18n/Android.mk | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/common/Android.mk b/common/Android.mk index b323dc26..63739f96 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -142,14 +142,14 @@ local_ldlibs := -ldl -lm -lpthread # include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(src_files) +LOCAL_SRC_FILES += $(src_files) LOCAL_C_INCLUDES += $(c_includes) -LOCAL_CFLAGS := $(local_cflags) -DPIC -fPIC +LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC LOCAL_SHARED_LIBRARIES += libdl LOCAL_LDLIBS += $(local_ldlibs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicuuc -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include abi/cpp/use_rtti.mk include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -162,13 +162,13 @@ include $(BUILD_SHARED_LIBRARY) ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) include $(LOCAL_PATH)/../stubdata/root.mk - LOCAL_SRC_FILES := $(src_files) - LOCAL_C_INCLUDES := $(c_includes) - LOCAL_CFLAGS := $(local_cflags) + LOCAL_SRC_FILES += $(src_files) + LOCAL_C_INCLUDES += $(c_includes) + LOCAL_CFLAGS += $(local_cflags) LOCAL_LDLIBS += $(local_ldlibs) - LOCAL_ADDITIONAL_DEPENDENCIES += $(HOST_OUT)/usr/icu/$(root).dat LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicuuc-host - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + LOCAL_ADDITIONAL_DEPENDENCIES += $(HOST_OUT)/usr/icu/$(root).dat include $(BUILD_HOST_SHARED_LIBRARY) endif diff --git a/i18n/Android.mk b/i18n/Android.mk index 35724150..a9b79480 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -102,14 +102,14 @@ local_ldlibs := -lpthread -lm # include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(src_files) +LOCAL_SRC_FILES += $(src_files) LOCAL_C_INCLUDES += $(c_includes) LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC LOCAL_SHARED_LIBRARIES += libicuuc LOCAL_LDLIBS += $(local_ldlibs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicui18n -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include abi/cpp/use_rtti.mk include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -121,13 +121,13 @@ include $(BUILD_SHARED_LIBRARY) ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(src_files) - LOCAL_C_INCLUDES := $(c_includes) + LOCAL_SRC_FILES += $(src_files) + LOCAL_C_INCLUDES += $(c_includes) LOCAL_CFLAGS += $(local_cflags) LOCAL_SHARED_LIBRARIES += libicuuc-host LOCAL_LDLIBS += $(local_ldlibs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicui18n-host - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_SHARED_LIBRARY) endif |