Update makefiles after merge of Chromium at e5f75e0d602b

This commit was generated by merge_from_chromium.py.

Change-Id: I277c43d571abaa40bab7afe9c8fdf0899aeb623c

30 files changed, 700 insertions, 90 deletions

diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index 4911d9a..42d9095 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -41,6 +41,13 @@ MY_CFLAGS_Debug := \
 	-fPIC \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -94,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -111,6 +119,13 @@ MY_CFLAGS_Release := \
 	-fPIC \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -164,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk
index 097f877..a541293 100644
--- a/icudata.host.darwin-arm64.mk
+++ b/icudata.host.darwin-arm64.mk
@@ -41,6 +41,13 @@ MY_CFLAGS_Debug := \
 	-fPIC \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -93,7 +100,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -110,6 +118,13 @@ MY_CFLAGS_Release := \
 	-fPIC \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -162,7 +177,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 0e07426..271d3b1 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -42,6 +42,13 @@ MY_CFLAGS_Debug := \
 	-fPIC \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -95,7 +102,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -113,6 +121,13 @@ MY_CFLAGS_Release := \
 	-fPIC \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -166,7 +181,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index 4911d9a..42d9095 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -41,6 +41,13 @@ MY_CFLAGS_Debug := \
 	-fPIC \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -94,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -111,6 +119,13 @@ MY_CFLAGS_Release := \
 	-fPIC \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -164,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk
index 8263657..cfaee0f 100644
--- a/icudata.host.darwin-x86_64.mk
+++ b/icudata.host.darwin-x86_64.mk
@@ -41,6 +41,13 @@ MY_CFLAGS_Debug := \
 	-fPIC \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -94,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -111,6 +119,13 @@ MY_CFLAGS_Release := \
 	-fPIC \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -164,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index f724679..efa429f 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -39,9 +39,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -95,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -110,9 +117,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -166,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk
index 807be96..1c27d6d 100644
--- a/icudata.host.linux-arm64.mk
+++ b/icudata.host.linux-arm64.mk
@@ -39,9 +39,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -94,7 +100,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -109,9 +116,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -164,7 +177,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index ca0bd23..e0d3112 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -40,9 +40,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -96,7 +102,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -112,9 +119,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -168,7 +181,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index f724679..efa429f 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -39,9 +39,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -95,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -110,9 +117,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-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 \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -166,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
index 819bdc4..e58a6eb 100644
--- a/icudata.host.linux-x86_64.mk
+++ b/icudata.host.linux-x86_64.mk
@@ -39,9 +39,15 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -95,7 +101,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 # Flags passed to both C and C++ files.
@@ -110,9 +117,15 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-format \
 	-m64 \
+	-Wheader-hygiene \
+	-Wno-char-subscripts \
+	-Wno-unneeded-internal-declaration \
+	-Wno-covered-switch-default \
+	-Wstring-conversion \
+	-Wno-c++11-narrowing \
+	-Wno-deprecated-register \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -166,7 +179,8 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-rtti \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
-	-Wno-deprecated
+	-Wno-deprecated \
+	-std=gnu++11
 
 
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 776e3d5..51a6fe2 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.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))
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk
index d5d1b17..190e7f2 100644
--- a/icui18n.host.darwin-arm64.mk
+++ b/icui18n.host.darwin-arm64.mk
@@ -204,6 +204,17 @@ MY_CFLAGS_Debug := \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 \
@@ -258,7 +269,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.
@@ -277,6 +289,17 @@ MY_CFLAGS_Release := \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 \
@@ -331,7 +354,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))
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index d6a82d1..b05171d 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -205,6 +205,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 \
@@ -260,7 +271,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.
@@ -280,6 +292,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 \
@@ -335,7 +358,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))
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))
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk
index cb88f5e..43fa89e 100644
--- a/icui18n.host.darwin-x86_64.mk
+++ b/icui18n.host.darwin-x86_64.mk
@@ -204,6 +204,17 @@ MY_CFLAGS_Debug := \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 \
 	-m64 \
+	-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))
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 63d114a..180dc00 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -200,11 +200,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -260,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.
@@ -275,11 +286,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -335,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))
diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk
index 359a97f..b630180 100644
--- a/icui18n.host.linux-arm64.mk
+++ b/icui18n.host.linux-arm64.mk
@@ -200,11 +200,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 +269,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.
@@ -274,11 +285,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 +354,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))
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index ed86bca..e79e70a 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -201,11 +201,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -261,7 +271,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.
@@ -277,11 +288,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -337,7 +358,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))
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index 63d114a..180dc00 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -200,11 +200,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -260,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.
@@ -275,11 +286,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-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 \
@@ -335,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))
diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk
index a0e1718..a7b0891 100644
--- a/icui18n.host.linux-x86_64.mk
+++ b/icui18n.host.linux-x86_64.mk
@@ -200,11 +200,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 \
@@ -260,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.
@@ -275,11 +286,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-fno-builtin-sin \
 	-Wno-format \
 	-m64 \
+	-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 \
@@ -335,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))
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index 650c6c9..83296c7 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -213,6 +213,17 @@ MY_CFLAGS_Debug := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -268,7 +279,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.
@@ -287,6 +299,17 @@ MY_CFLAGS_Release := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -342,7 +365,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))
diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk
index c947299..cb135ae 100644
--- a/icuuc.host.darwin-arm64.mk
+++ b/icuuc.host.darwin-arm64.mk
@@ -213,6 +213,17 @@ MY_CFLAGS_Debug := \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -267,7 +278,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.
@@ -286,6 +298,17 @@ MY_CFLAGS_Release := \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -340,7 +363,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))
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 7e92aed..a22b612 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -214,6 +214,17 @@ MY_CFLAGS_Debug := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -269,7 +280,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.
@@ -289,6 +301,17 @@ MY_CFLAGS_Release := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -344,7 +367,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))
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 650c6c9..83296c7 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -213,6 +213,17 @@ MY_CFLAGS_Debug := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -268,7 +279,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.
@@ -287,6 +299,17 @@ MY_CFLAGS_Release := \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -342,7 +365,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))
diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk
index ac4baf5..ed364f3 100644
--- a/icuuc.host.darwin-x86_64.mk
+++ b/icuuc.host.darwin-x86_64.mk
@@ -213,6 +213,17 @@ MY_CFLAGS_Debug := \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -268,7 +279,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.
@@ -287,6 +299,17 @@ MY_CFLAGS_Release := \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -342,7 +365,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))
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 055c284..e1044b4 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -209,11 +209,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -269,7 +279,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.
@@ -284,11 +295,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -344,7 +365,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))
diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk
index e56edd9..f1e106e 100644
--- a/icuuc.host.linux-arm64.mk
+++ b/icuuc.host.linux-arm64.mk
@@ -209,11 +209,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -268,7 +278,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.
@@ -283,11 +294,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -342,7 +363,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))
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index d1cc1a7..963db5b 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -210,11 +210,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -270,7 +280,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.
@@ -286,11 +297,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -346,7 +367,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))
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index 055c284..e1044b4 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -209,11 +209,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -269,7 +279,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.
@@ -284,11 +295,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -344,7 +365,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))
diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk
index f99a488..98b5150 100644
--- a/icuuc.host.linux-x86_64.mk
+++ b/icuuc.host.linux-x86_64.mk
@@ -209,11 +209,21 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-g \
 	-fdata-sections \
@@ -269,7 +279,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.
@@ -284,11 +295,21 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unused-local-typedefs \
 	-Wno-deprecated-declarations \
 	-Wno-unused-function \
 	-Wno-format \
 	-m64 \
+	-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-switch \
 	-Os \
 	-fno-ident \
 	-fdata-sections \
@@ -344,7 +365,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))