diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-29 18:55:13 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-30 10:34:27 -0700 |
| commit | 2e308945ed3e9792a01d49c3bb2d6238fdb5d671 (patch) | |
| tree | c72c9eca8f1c8cc5d76af411e2fa5bc225c19192 | |
| parent | 93a1f7aef9998efedba08fa99ba378488d092b4c (diff) | |
| download | icu4c-2e308945ed3e9792a01d49c3bb2d6238fdb5d671.tar.gz | |
Switch to using libstlport.mk and use_rtti.mk.
Change-Id: I24244bc811e6cdd4b09f30546283b9808550d3cb
| -rw-r--r-- | common/Android.mk | 9 | ||||
| -rw-r--r-- | i18n/Android.mk | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/common/Android.mk b/common/Android.mk index e175338b..b323dc26 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -143,16 +143,15 @@ local_ldlibs := -ldl -lm -lpthread include $(CLEAR_VARS) LOCAL_SRC_FILES := $(src_files) -LOCAL_C_INCLUDES := $(c_includes) -LOCAL_C_INCLUDES += abi/cpp/include # RTTI -LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include # STL +LOCAL_C_INCLUDES += $(c_includes) LOCAL_CFLAGS := $(local_cflags) -DPIC -fPIC -LOCAL_RTTI_FLAG := -frtti -LOCAL_SHARED_LIBRARIES += libgabi++ libdl libstlport +LOCAL_SHARED_LIBRARIES += libdl LOCAL_LDLIBS += $(local_ldlibs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libicuuc LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +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 33146dc3..35724150 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -104,15 +104,14 @@ local_ldlibs := -lpthread -lm include $(CLEAR_VARS) LOCAL_SRC_FILES := $(src_files) LOCAL_C_INCLUDES += $(c_includes) -LOCAL_C_INCLUDES += abi/cpp/include # RTTI -LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include # STL LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC -LOCAL_RTTI_FLAG := -frtti -LOCAL_SHARED_LIBRARIES += libicuuc libgabi++ libstlport +LOCAL_SHARED_LIBRARIES += libicuuc 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) |