diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:49 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:49 +0000 |
| commit | 81692763cc56da929a1b8687416bc612f977b04b (patch) | |
| tree | 768d02c19ae4168c37daf5cc2bb5d065ed77b11a /icuuc.target.linux-mips.mk | |
| parent | 63cea03ec30f541dd4d27ee8b860b13ce7119a2f (diff) | |
| download | icu-81692763cc56da929a1b8687416bc612f977b04b.tar.gz | |
Update makefiles after merge of Chromium at 6a4d455b8650
This commit was generated by merge_from_chromium.py.
Change-Id: I1a604b2286a8a9488fa6d079eb903478f5a8d958
Diffstat (limited to 'icuuc.target.linux-mips.mk')
| -rw-r--r-- | icuuc.target.linux-mips.mk | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/icuuc.target.linux-mips.mk b/icuuc.target.linux-mips.mk index 34c7528..77c7e86 100644 --- a/icuuc.target.linux-mips.mk +++ b/icuuc.target.linux-mips.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_gyp LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -418,44 +417,6 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -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 |