diff options
| author | Ying Wang <wangying@google.com> | 2013-12-05 00:15:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-05 00:15:40 +0000 |
| commit | 75e18f0c2c5278242f158003f440634df70ddd8e (patch) | |
| tree | 698eb68cede0df367a70134d8538468541254bbe | |
| parent | 7ca9ba79d0b58aeadcc54451d76815a504262a8f (diff) | |
| parent | b44d38b05ff94cd9a5bbd224e2bb39693958302f (diff) | |
| download | icu4c-75e18f0c2c5278242f158003f440634df70ddd8e.tar.gz | |
Merge "Use "-include" to not fail apps_only build."idea133
| -rw-r--r-- | common/Android.mk | 29 | ||||
| -rw-r--r-- | i18n/Android.mk | 27 |
2 files changed, 27 insertions, 29 deletions
diff --git a/common/Android.mk b/common/Android.mk index fec6d75b..825b0a7f 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -139,21 +139,20 @@ local_ldlibs := -ldl -lm -lpthread # Build for the target (device). # -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 +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 +# Use "-include" to not fail apps_only build. +-include abi/cpp/use_rtti.mk +-include external/stlport/libstlport.mk +include $(BUILD_SHARED_LIBRARY) # diff --git a/i18n/Android.mk b/i18n/Android.mk index 61f36f96..860dc141 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -101,20 +101,19 @@ local_ldlibs := -lpthread -lm # Build for the target (device). # -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 +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 +# Use "-include" to not fail apps_only build. +-include abi/cpp/use_rtti.mk +-include external/stlport/libstlport.mk +include $(BUILD_SHARED_LIBRARY) # |