From 6f07e480e38353d842548c43b980dd90e10ee80f Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Thu, 28 Aug 2014 19:48:52 +0000 Subject: Update makefiles after merge of Chromium at e5f75e0d602b This commit was generated by merge_from_chromium.py. Change-Id: I277c43d571abaa40bab7afe9c8fdf0899aeb623c --- icui18n.host.darwin-x86.mk | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'icui18n.host.darwin-x86.mk') diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk index 776e3d5..51a6fe2 100644 --- a/icui18n.host.darwin-x86.mk +++ b/icui18n.host.darwin-x86.mk @@ -204,6 +204,17 @@ MY_CFLAGS_Debug := \ -fno-builtin-sin \ -Wno-format \ -m32 \ + -Wheader-hygiene \ + -Wno-char-subscripts \ + -Wno-unneeded-internal-declaration \ + -Wno-covered-switch-default \ + -Wstring-conversion \ + -Wno-c++11-narrowing \ + -Wno-deprecated-register \ + -Wno-deprecated-declarations \ + -Wno-logical-op-parentheses \ + -Wno-tautological-compare \ + -Wno-return-type-c-linkage \ -Os \ -g \ -fdata-sections \ @@ -259,7 +270,8 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -frtti \ - -Wno-deprecated + -Wno-deprecated \ + -std=gnu++11 # Flags passed to both C and C++ files. @@ -278,6 +290,17 @@ MY_CFLAGS_Release := \ -fno-builtin-sin \ -Wno-format \ -m32 \ + -Wheader-hygiene \ + -Wno-char-subscripts \ + -Wno-unneeded-internal-declaration \ + -Wno-covered-switch-default \ + -Wstring-conversion \ + -Wno-c++11-narrowing \ + -Wno-deprecated-register \ + -Wno-deprecated-declarations \ + -Wno-logical-op-parentheses \ + -Wno-tautological-compare \ + -Wno-return-type-c-linkage \ -Os \ -fno-ident \ -fdata-sections \ @@ -333,7 +356,8 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -frtti \ - -Wno-deprecated + -Wno-deprecated \ + -std=gnu++11 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) -- cgit v1.2.3