diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 11:28:24 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 11:28:24 +0000 |
| commit | fc1488d5ca3c9464d9f59ee5a6cdbe59a3e09ab4 (patch) | |
| tree | 05b4fa9308868016aeb3335ddcf9ca264222ce0e /libvpx_asm_offsets_vpx_scale.target.linux-arm.mk | |
| parent | c4ae3a731f4de0fb3d09d20e1427fc96e879411d (diff) | |
| download | libvpx-fc1488d5ca3c9464d9f59ee5a6cdbe59a3e09ab4.tar.gz | |
Update makefiles after merge of Chromium at 262110
This commit was generated by merge_from_chromium.py.
Change-Id: I4638e05f39a15bcbc0afcc21866b3661489465b5
Diffstat (limited to 'libvpx_asm_offsets_vpx_scale.target.linux-arm.mk')
| -rw-r--r-- | libvpx_asm_offsets_vpx_scale.target.linux-arm.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk index f4adef6..922069a 100644 --- a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk +++ b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk @@ -71,7 +71,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -161,7 +160,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -212,9 +210,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -231,9 +229,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ |