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 | a59ff605aa9bc3206db01fc64232a5ec7eb970be (patch) | |
| tree | 02f167744b5b43319be25022be4c03e8aec6c2ca /libsrtp.target.linux-arm.mk | |
| parent | 0b4f9825b302e9568bb0917801a1f727c2af31c2 (diff) | |
| download | libsrtp-a59ff605aa9bc3206db01fc64232a5ec7eb970be.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I109cfdb89708cb5ccbf5d9fada2be50407a1bebc
Diffstat (limited to 'libsrtp.target.linux-arm.mk')
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 3b9abcb..b492cf2 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -53,7 +53,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -157,6 +156,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 \ @@ -174,7 +174,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -278,6 +277,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 \ |