Update makefiles after merge of Chromium at 223269
This commit was generated by merge_from_chromium.py.
Change-Id: Ie0393f6a40ef36e876eea3cd3dc02ff253afe151
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
index 4471b79..1cf0c15 100644
--- a/icudata.host.darwin-arm.mk
+++ b/icudata.host.darwin-arm.mk
@@ -58,7 +58,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -117,7 +116,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
index 70e89a7..c4d20a6 100644
--- a/icudata.host.darwin-mips.mk
+++ b/icudata.host.darwin-mips.mk
@@ -59,7 +59,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -119,7 +118,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
index 2383b87..b1f7bff 100644
--- a/icudata.host.darwin-x86.mk
+++ b/icudata.host.darwin-x86.mk
@@ -58,7 +58,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -119,7 +118,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
index 9db47ef..4d498d5 100644
--- a/icudata.host.linux-arm.mk
+++ b/icudata.host.linux-arm.mk
@@ -58,7 +58,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -117,7 +116,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
index b6b72c1..0c0fd9f 100644
--- a/icudata.host.linux-mips.mk
+++ b/icudata.host.linux-mips.mk
@@ -59,7 +59,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -119,7 +118,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
index 0740a27..96262dd 100644
--- a/icudata.host.linux-x86.mk
+++ b/icudata.host.linux-x86.mk
@@ -58,7 +58,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -119,7 +118,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
index d4bacc4..d4c95d3 100644
--- a/icui18n.host.darwin-arm.mk
+++ b/icui18n.host.darwin-arm.mk
@@ -207,7 +207,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -269,7 +268,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
index 947f572..bd36d96 100644
--- a/icui18n.host.darwin-mips.mk
+++ b/icui18n.host.darwin-mips.mk
@@ -208,7 +208,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -271,7 +270,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
index 0843382..d11609d 100644
--- a/icui18n.host.darwin-x86.mk
+++ b/icui18n.host.darwin-x86.mk
@@ -207,7 +207,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -271,7 +270,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
index eb5aaca..447169e 100644
--- a/icui18n.host.linux-arm.mk
+++ b/icui18n.host.linux-arm.mk
@@ -207,7 +207,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -269,7 +268,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
index b4a8847..851caaf 100644
--- a/icui18n.host.linux-mips.mk
+++ b/icui18n.host.linux-mips.mk
@@ -208,7 +208,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -271,7 +270,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
index a637841..e23b4dd 100644
--- a/icui18n.host.linux-x86.mk
+++ b/icui18n.host.linux-x86.mk
@@ -207,7 +207,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -271,7 +270,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
index d73439f..244fe0c 100644
--- a/icuuc.host.darwin-arm.mk
+++ b/icuuc.host.darwin-arm.mk
@@ -212,7 +212,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -274,7 +273,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
index 1b999b4..2404273 100644
--- a/icuuc.host.darwin-mips.mk
+++ b/icuuc.host.darwin-mips.mk
@@ -213,7 +213,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -276,7 +275,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
index 0434fc9..cdfc7fd 100644
--- a/icuuc.host.darwin-x86.mk
+++ b/icuuc.host.darwin-x86.mk
@@ -212,7 +212,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -276,7 +275,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
index 263d83b..fe97081 100644
--- a/icuuc.host.linux-arm.mk
+++ b/icuuc.host.linux-arm.mk
@@ -212,7 +212,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -274,7 +273,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
index 44bf183..693e24e 100644
--- a/icuuc.host.linux-mips.mk
+++ b/icuuc.host.linux-mips.mk
@@ -213,7 +213,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -276,7 +275,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
index d4b6e48..406eaa5 100644
--- a/icuuc.host.linux-x86.mk
+++ b/icuuc.host.linux-x86.mk
@@ -212,7 +212,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -276,7 +275,6 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
