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 | e1beb499e305550c8c7ba736ceb63e1de141c534 (patch) | |
| tree | 035717e5254281f0fd9e8d24ce96cf530d7ff9b5 /libvpx.target.linux-x86.mk | |
| parent | 911b346af23643f33139ef751b7fdf9d204a07bb (diff) | |
| download | libvpx-e1beb499e305550c8c7ba736ceb63e1de141c534.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I5e621e365faf0a11227075d3eeae4e41ed17a5cc
Diffstat (limited to 'libvpx.target.linux-x86.mk')
| -rw-r--r-- | libvpx.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk index 661665d..4a3d7c0 100644 --- a/libvpx.target.linux-x86.mk +++ b/libvpx.target.linux-x86.mk @@ -727,7 +727,6 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -817,6 +816,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 \ @@ -832,7 +832,6 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -922,6 +921,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 \ |