commit 1bf9e78af6482bd85c0a77b253a74c19253e7fbd
author Android Chromium Automerger <chromium-automerger@android> Sat Sep 14 22:58:33 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Sat Sep 14 22:58:33 2013 +0000
tree c711219580a5e0d956e66818676d70dfd79d97e3
parent ec1735c9966ee21589ac5354eae79e9468d84930

Update makefiles after merge of Chromium at 223266

This commit was generated by merge_from_chromium.py.

Change-Id: Ia7e2fd385a21621713426de44a154985a75d837f

ft2.target.darwin-arm.mk

diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index c4da0f7..9788cef 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -90,6 +90,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -176,6 +177,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \

ft2.target.darwin-mips.mk

diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 3d8f4da..08a8468 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -90,6 +90,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -176,6 +177,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \

ft2.target.darwin-x86.mk

diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 8357db3..4376e23 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -92,6 +92,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -181,6 +182,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \

ft2.target.linux-arm.mk

diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index c4da0f7..9788cef 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -90,6 +90,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -176,6 +177,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \

ft2.target.linux-mips.mk

diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 3d8f4da..08a8468 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -90,6 +90,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -176,6 +177,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \

ft2.target.linux-x86.mk

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 8357db3..4376e23 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -92,6 +92,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -181,6 +182,7 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \