diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:50 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-13 10:09:50 +0000 |
commit | 4dfcfe57fc2305484fbecdae109ce905600fa751 (patch) | |
tree | 26750560f3a72ae354c3dd3b43d20a70517b5917 /libsrtp.target.linux-x86.mk | |
parent | a59ff605aa9bc3206db01fc64232a5ec7eb970be (diff) | |
download | libsrtp-4dfcfe57fc2305484fbecdae109ce905600fa751.tar.gz |
Update makefiles after merge of Chromium at 6a4d455b8650
This commit was generated by merge_from_chromium.py.
Change-Id: I1795bb36cd59bc740a3d55d60849561e7e5f1420
Diffstat (limited to 'libsrtp.target.linux-x86.mk')
-rw-r--r-- | libsrtp.target.linux-x86.mk | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index 56150a2..656e876 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libsrtp_libsrtp_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)) @@ -285,46 +284,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 \ - -m32 \ - -fuse-ld=gold \ - -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 \ - -m32 \ - -fuse-ld=gold \ - -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 |