Update makefiles after merge of Chromium at ba4cf8bb6dc7
This commit was generated by merge_from_chromium.py.
Change-Id: I36b914a4f751264d5ab0676f1dff581bb3ed2696
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index b22d793..ef1aa63 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk
index 67a77db..15aa0d2 100644
--- a/icudata.host.darwin-arm64.mk
+++ b/icudata.host.darwin-arm64.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -126,6 +127,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index e9b530c..9b4bcf3 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -47,6 +47,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -129,6 +130,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index b22d793..ef1aa63 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk
index 3940b0f..98c6616 100644
--- a/icudata.host.darwin-x86_64.mk
+++ b/icudata.host.darwin-x86_64.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 448d9a8..11d5620 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk
index 40511c2..0ab6bde 100644
--- a/icudata.host.linux-arm64.mk
+++ b/icudata.host.linux-arm64.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -126,6 +127,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index d671116..3fdbb91 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -47,6 +47,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -129,6 +130,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 448d9a8..11d5620 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
index a86d30f..f55d474 100644
--- a/icudata.host.linux-x86_64.mk
+++ b/icudata.host.linux-x86_64.mk
@@ -46,6 +46,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-g \
-gdwarf-4 \
@@ -127,6 +128,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Os \
-fno-ident \
-fdata-sections \
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index 7bb717b..4f89d08 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk
index 27393f3..a64c964 100644
--- a/icui18n.host.darwin-arm64.mk
+++ b/icui18n.host.darwin-arm64.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -297,6 +298,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index 21dc564..19255e4 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -210,6 +210,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -300,6 +301,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 7bb717b..4f89d08 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk
index efd7ba1..0ca72a0 100644
--- a/icui18n.host.darwin-x86_64.mk
+++ b/icui18n.host.darwin-x86_64.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index 7bb717b..4f89d08 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk
index 27393f3..a64c964 100644
--- a/icui18n.host.linux-arm64.mk
+++ b/icui18n.host.linux-arm64.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -297,6 +298,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index 21dc564..19255e4 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -210,6 +210,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -300,6 +301,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index 7bb717b..4f89d08 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk
index efd7ba1..0ca72a0 100644
--- a/icui18n.host.linux-x86_64.mk
+++ b/icui18n.host.linux-x86_64.mk
@@ -209,6 +209,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -298,6 +299,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index 06435d5..f877835 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -218,6 +218,7 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk
index 95cbfd2..14c33de 100644
--- a/icuuc.host.darwin-arm64.mk
+++ b/icuuc.host.darwin-arm64.mk
@@ -218,6 +218,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -306,6 +307,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index a12bf18..9c2673f 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -219,6 +219,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -309,6 +310,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 06435d5..f877835 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -218,6 +218,7 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk
index ce3c0ca..613a76a 100644
--- a/icuuc.host.darwin-x86_64.mk
+++ b/icuuc.host.darwin-x86_64.mk
@@ -218,6 +218,7 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
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 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk
index 95cbfd2..14c33de 100644
--- a/icuuc.host.linux-arm64.mk
+++ b/icuuc.host.linux-arm64.mk
@@ -218,6 +218,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -306,6 +307,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index a12bf18..9c2673f 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -219,6 +219,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
@@ -309,6 +310,7 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index 06435d5..f877835 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -218,6 +218,7 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \
diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk
index ce3c0ca..613a76a 100644
--- a/icuuc.host.linux-x86_64.mk
+++ b/icuuc.host.linux-x86_64.mk
@@ -218,6 +218,7 @@
-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 @@
-Wstring-conversion \
-Wno-c++11-narrowing \
-Wno-deprecated-register \
+ -Wno-unused-local-typedef \
-Wno-deprecated-declarations \
-Wno-logical-op-parentheses \
-Wno-tautological-compare \