From 97a64e2bd068dea306c6de91602cb5d4002e0291 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Mon, 7 Apr 2014 11:28:24 +0000 Subject: Update makefiles after merge of Chromium at 262110 This commit was generated by merge_from_chromium.py. Change-Id: I16520e5550a81c5a16a4c7a907bedd1f481e6135 --- modules/audio_processing_neon.target.darwin-arm.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/audio_processing_neon.target.darwin-arm.mk') diff --git a/modules/audio_processing_neon.target.darwin-arm.mk b/modules/audio_processing_neon.target.darwin-arm.mk index 0b2ca390..ea66df30 100644 --- a/modules/audio_processing_neon.target.darwin-arm.mk +++ b/modules/audio_processing_neon.target.darwin-arm.mk @@ -82,7 +82,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -193,7 +192,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -259,9 +257,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 \ @@ -278,9 +276,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 \ -- cgit v1.2.3