diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:37 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:37 +0000 |
| commit | 40d8f859f097f75c5bfd85ac8f04c3b983afe0e1 (patch) | |
| tree | b867380cef0e87c5eb0d8f79957119437ca25441 /webrtc.target.linux-x86.mk | |
| parent | 8f88adf74ee77ddc03c123898e1b0790f67aa4cd (diff) | |
| download | webrtc-40d8f859f097f75c5bfd85ac8f04c3b983afe0e1.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I03e28d2901e702a21f5ad8f0aba69055baff2d94
Diffstat (limited to 'webrtc.target.linux-x86.mk')
| -rw-r--r-- | webrtc.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk index a7abd462..12cf0e8e 100644 --- a/webrtc.target.linux-x86.mk +++ b/webrtc.target.linux-x86.mk @@ -37,7 +37,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -134,6 +133,7 @@ LOCAL_C_INCLUDES_Debug := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Debug := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -149,7 +149,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -247,6 +246,7 @@ LOCAL_C_INCLUDES_Release := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Release := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ |