Update makefiles after merge of Chromium at 262110
This commit was generated by merge_from_chromium.py.
Change-Id: I16520e5550a81c5a16a4c7a907bedd1f481e6135
diff --git a/modules/video_capture_module.target.darwin-arm.mk b/modules/video_capture_module.target.darwin-arm.mk
index 421ca5e..3532fb8 100644
--- a/modules/video_capture_module.target.darwin-arm.mk
+++ b/modules/video_capture_module.target.darwin-arm.mk
@@ -81,7 +81,6 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -189,7 +188,6 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -254,9 +252,9 @@
### 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 \
@@ -273,9 +271,9 @@
LOCAL_LDFLAGS_Release := \
- -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
+ -Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
-Wl,-z,relro \