Update makefiles after merge of Chromium at a99b7ad25d02
This commit was generated by merge_from_chromium.py.
Change-Id: I50b9244bcce865fadd6a0df93c911cf163c9c40f
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 895b9bf..2e81690 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -114,6 +114,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -219,6 +220,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index c5f92c2..8117493 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -103,6 +103,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -196,6 +197,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 48815f9..144d9bd 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -107,6 +107,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -205,6 +206,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index db0afcd..344f371 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -109,6 +109,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -208,6 +209,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 8e47cb9..051a415 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -108,6 +108,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -206,6 +207,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 895b9bf..2e81690 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -114,6 +114,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -219,6 +220,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index c5f92c2..8117493 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -103,6 +103,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -196,6 +197,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 48815f9..144d9bd 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -107,6 +107,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -205,6 +206,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index db0afcd..344f371 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -109,6 +109,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -208,6 +209,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 8e47cb9..051a415 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -108,6 +108,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -206,6 +207,7 @@
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
