aboutsummaryrefslogtreecommitdiff
path: root/icuuc.host.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-08-28 19:48:52 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-08-28 19:48:52 +0000
commit6f07e480e38353d842548c43b980dd90e10ee80f (patch)
treedab4c1c0ad3ed014ef9036cadc77d799a669ad4e /icuuc.host.linux-arm.mk
parent139220650762d07d3342feda5256912f954ec604 (diff)
downloadicu-6f07e480e38353d842548c43b980dd90e10ee80f.tar.gz
Update makefiles after merge of Chromium at e5f75e0d602b
This commit was generated by merge_from_chromium.py. Change-Id: I277c43d571abaa40bab7afe9c8fdf0899aeb623c
Diffstat (limited to 'icuuc.host.linux-arm.mk')
-rw-r--r--icuuc.host.linux-arm.mk30
1 files changed, 26 insertions, 4 deletions
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))