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