diff options
| -rw-r--r-- | Android.mk | 55 |
1 files changed, 3 insertions, 52 deletions
@@ -2,6 +2,7 @@ BASE_PATH := $(call my-dir) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # We default to release for the Android build system. Developers debugging # code can build with "Debug" @@ -133,8 +134,6 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -216,8 +215,6 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -232,56 +229,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor \ -Wno-sign-promo +LOCAL_SHARED_LIBRARIES := libicuuc libicui18n + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) -### Rules for final target. - -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--gc-sections \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl \ - -include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) |