Update makefiles after merge of Chromium at 261622
This commit was generated by merge_from_chromium.py.
Change-Id: Ibcf1b1a06baf20a0a4c5e3ba3051457e35d30f9b
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index a620dc8..89fe3ba 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_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -185,6 +186,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index ef80742..13ce530 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_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -185,6 +186,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 85ed861..019b526 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -91,6 +91,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -186,6 +187,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 603df64..dadd82c 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -91,6 +91,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -186,6 +187,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index a620dc8..89fe3ba 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_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -185,6 +186,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index ef80742..13ce530 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_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -185,6 +186,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 85ed861..019b526 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -91,6 +91,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -186,6 +187,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 603df64..dadd82c 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -91,6 +91,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
@@ -186,6 +187,7 @@
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_MOJO=1' \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \