diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:36 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-11 17:45:36 +0000 |
| commit | 63cea03ec30f541dd4d27ee8b860b13ce7119a2f (patch) | |
| tree | 20c46296fcd07f6fcff2d3e2c2c2602448611471 /icudata.target.darwin-arm.mk | |
| parent | de6c98985b0ee497d9a15ebd88bb59727aaa0b4d (diff) | |
| download | icu-63cea03ec30f541dd4d27ee8b860b13ce7119a2f.tar.gz | |
Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I9fcfaa7698e42b6e0818815b362cdc57acd7cb9c
Diffstat (limited to 'icudata.target.darwin-arm.mk')
| -rw-r--r-- | icudata.target.darwin-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/icudata.target.darwin-arm.mk b/icudata.target.darwin-arm.mk index a3ec5c4..4888f26 100644 --- a/icudata.target.darwin-arm.mk +++ b/icudata.target.darwin-arm.mk @@ -30,7 +30,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 \ @@ -123,6 +122,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 \ @@ -140,7 +140,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 \ @@ -233,6 +232,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 \ |