Update makefiles after merge of Chromium at 223266
This commit was generated by merge_from_chromium.py.
Change-Id: Iba615e864af90268dc48668005389a72296d5508
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index c22af81..0633bd9 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -624,6 +624,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -724,6 +725,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 2dbfbed..fba13bb 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -621,6 +621,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -718,6 +719,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 695694c..4dbd5ad 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -629,6 +629,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -738,6 +739,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index c22af81..0633bd9 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -624,6 +624,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -724,6 +725,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 2dbfbed..fba13bb 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -621,6 +621,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -718,6 +719,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 695694c..4dbd5ad 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -629,6 +629,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
@@ -738,6 +739,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_XI2_MT=2' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
