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 | 48c849a63c568a376fe3f3d98f10b86de5c6a250 (patch) | |
| tree | b7fd264c33551d099c94cb880a2cc86e262fa037 /libvpx_intrinsics_ssse3.target.linux-x86_64.mk | |
| parent | e1beb499e305550c8c7ba736ceb63e1de141c534 (diff) | |
| download | libvpx-48c849a63c568a376fe3f3d98f10b86de5c6a250.tar.gz | |
Update makefiles after merge of Chromium at 6a4d455b8650
This commit was generated by merge_from_chromium.py.
Change-Id: Icb9f7591cd26971a587ac851bd2afc6bb2a4f1ad
Diffstat (limited to 'libvpx_intrinsics_ssse3.target.linux-x86_64.mk')
| -rw-r--r-- | libvpx_intrinsics_ssse3.target.linux-x86_64.mk | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk index 2a99550..4167d26 100644 --- a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk +++ b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_ssse3_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)) @@ -235,46 +234,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 \ - -m64 \ - -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 \ - -m64 \ - -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 |