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 | 97a64e2bd068dea306c6de91602cb5d4002e0291 (patch) | |
| tree | 7b4e59452853d7017ab2820fcd6f8e000b9bebb3 /modules/webrtc_video_coding.target.linux-x86.mk | |
| parent | e111a22c86b4609993cc70cd41b11b8d02f53454 (diff) | |
| download | webrtc-97a64e2bd068dea306c6de91602cb5d4002e0291.tar.gz | |
Update makefiles after merge of Chromium at 262110
This commit was generated by merge_from_chromium.py.
Change-Id: I16520e5550a81c5a16a4c7a907bedd1f481e6135
Diffstat (limited to 'modules/webrtc_video_coding.target.linux-x86.mk')
| -rw-r--r-- | modules/webrtc_video_coding.target.linux-x86.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/webrtc_video_coding.target.linux-x86.mk b/modules/webrtc_video_coding.target.linux-x86.mk index 82ac09bb..f867e436 100644 --- a/modules/webrtc_video_coding.target.linux-x86.mk +++ b/modules/webrtc_video_coding.target.linux-x86.mk @@ -101,7 +101,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -206,7 +205,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -267,9 +265,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 \ -m32 \ @@ -284,9 +282,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ |