diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-11-26 19:57:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-26 19:57:00 +0000 |
| commit | 7ca9ba79d0b58aeadcc54451d76815a504262a8f (patch) | |
| tree | f0cf0d890e70866fd5055cef7b70d0ae7a61c9bf | |
| parent | 045f3c0f38babb08ee0589064820abe158039ab5 (diff) | |
| parent | abfd5e82348c8dda0dad79b5870de92f86df2b47 (diff) | |
| download | icu4c-7ca9ba79d0b58aeadcc54451d76815a504262a8f.tar.gz | |
Merge "Omit platform shared lib target when building apps."
| -rw-r--r-- | common/Android.mk | 28 | ||||
| -rw-r--r-- | i18n/Android.mk | 26 |
2 files changed, 29 insertions, 25 deletions
diff --git a/common/Android.mk b/common/Android.mk index 7c8d0d4e..fec6d75b 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -139,19 +139,21 @@ local_ldlibs := -ldl -lm -lpthread # Build for the target (device). # -include $(CLEAR_VARS) -LOCAL_SRC_FILES += $(src_files) -LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) -LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC -LOCAL_SHARED_LIBRARIES += libdl $(optional_android_logging_libraries) -LOCAL_LDLIBS += $(local_ldlibs) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libicuuc -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -LOCAL_REQUIRED_MODULES += icu-data -include abi/cpp/use_rtti.mk -include external/stlport/libstlport.mk -include $(BUILD_SHARED_LIBRARY) +ifeq ($(TARGET_BUILD_APPS),) + include $(CLEAR_VARS) + LOCAL_SRC_FILES += $(src_files) + LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) + LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC + LOCAL_SHARED_LIBRARIES += libdl $(optional_android_logging_libraries) + LOCAL_LDLIBS += $(local_ldlibs) + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE := libicuuc + LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + LOCAL_REQUIRED_MODULES += icu-data + include abi/cpp/use_rtti.mk + include external/stlport/libstlport.mk + include $(BUILD_SHARED_LIBRARY) +endif # diff --git a/i18n/Android.mk b/i18n/Android.mk index d769c8bd..61f36f96 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -101,18 +101,20 @@ local_ldlibs := -lpthread -lm # Build for the target (device). # -include $(CLEAR_VARS) -LOCAL_SRC_FILES += $(src_files) -LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) -LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC -LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries) -LOCAL_LDLIBS += $(local_ldlibs) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libicui18n -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -include abi/cpp/use_rtti.mk -include external/stlport/libstlport.mk -include $(BUILD_SHARED_LIBRARY) +ifeq ($(TARGET_BUILD_APPS),) + include $(CLEAR_VARS) + LOCAL_SRC_FILES += $(src_files) + LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes) + LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC + LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries) + LOCAL_LDLIBS += $(local_ldlibs) + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE := libicui18n + LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + include abi/cpp/use_rtti.mk + include external/stlport/libstlport.mk + include $(BUILD_SHARED_LIBRARY) +endif # |