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 | 6a38c97d67bee03341ceeea27a4192a03a67742b (patch) | |
| tree | ff57aa306a3d500b7bc8af48165718f0ca960b90 /dl/openmax_dl_armv7.target.linux-arm.mk | |
| parent | 240abc79a595ceb8370f7bf836513d958b7af478 (diff) | |
| download | openmax_dl-6a38c97d67bee03341ceeea27a4192a03a67742b.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I941ff64d0e9a467b1a5e26db7e38083d2a78a5ac
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index a86841b..93ccd45 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -39,7 +39,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 \ @@ -127,6 +126,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 \ @@ -144,7 +144,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 \ @@ -232,6 +231,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 \ |