From 63cea03ec30f541dd4d27ee8b860b13ce7119a2f Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Thu, 11 Sep 2014 17:45:36 +0000
Subject: Update makefiles after merge of Chromium at b62471bd5180

This commit was generated by merge_from_chromium.py.

Change-Id: I9fcfaa7698e42b6e0818815b362cdc57acd7cb9c
---
 icudata.target.darwin-arm.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'icudata.target.darwin-arm.mk')

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 \
-- 
cgit v1.2.3