aboutsummaryrefslogtreecommitdiff
path: root/icuuc.host.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-26 03:22:12 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-26 03:22:12 +0000
commit56419111a2fdfa8fb2fd0a0e9c3acb79d29579c2 (patch)
treebc6c250624a22e5c019ea92089f3ed91055ad76f /icuuc.host.linux-arm.mk
parent95e9a52df512255432e97fcf706044fb2b059eb1 (diff)
downloadicu-56419111a2fdfa8fb2fd0a0e9c3acb79d29579c2.tar.gz
Update makefiles after merge of Chromium at ba4cf8bb6dc7
This commit was generated by merge_from_chromium.py. Change-Id: I36b914a4f751264d5ab0676f1dff581bb3ed2696
Diffstat (limited to 'icuuc.host.linux-arm.mk')
-rw-r--r--icuuc.host.linux-arm.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 06435d5..f877835 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -218,6 +218,7 @@ MY_CFLAGS_Debug := \
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -307,6 +308,7 @@ MY_CFLAGS_Release := \
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \