Update makefiles after merge of Chromium at a99b7ad25d02

This commit was generated by merge_from_chromium.py.

Change-Id: If287a1404e15e309d5d047afeb229927133aaa6f

10 files changed, 20 insertions, 0 deletions

diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk
index 41380de..a09bead 100644
--- a/libjpeg.target.darwin-arm.mk
+++ b/libjpeg.target.darwin-arm.mk
@@ -139,6 +139,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -239,6 +240,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk
index 19b914c..2d9875d 100644
--- a/libjpeg.target.darwin-arm64.mk
+++ b/libjpeg.target.darwin-arm64.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -216,6 +217,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk
index 9dbc655..1f6a290 100644
--- a/libjpeg.target.darwin-mips.mk
+++ b/libjpeg.target.darwin-mips.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -224,6 +225,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk
index a7875de..d0a3c98 100644
--- a/libjpeg.target.darwin-x86.mk
+++ b/libjpeg.target.darwin-x86.mk
@@ -500,6 +500,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -594,6 +595,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk
index 0557c56..a06f87d 100644
--- a/libjpeg.target.darwin-x86_64.mk
+++ b/libjpeg.target.darwin-x86_64.mk
@@ -301,6 +301,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -394,6 +395,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk
index 41380de..a09bead 100644
--- a/libjpeg.target.linux-arm.mk
+++ b/libjpeg.target.linux-arm.mk
@@ -139,6 +139,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -239,6 +240,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk
index 19b914c..2d9875d 100644
--- a/libjpeg.target.linux-arm64.mk
+++ b/libjpeg.target.linux-arm64.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -216,6 +217,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk
index 9dbc655..1f6a290 100644
--- a/libjpeg.target.linux-mips.mk
+++ b/libjpeg.target.linux-mips.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -224,6 +225,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk
index a7875de..d0a3c98 100644
--- a/libjpeg.target.linux-x86.mk
+++ b/libjpeg.target.linux-x86.mk
@@ -500,6 +500,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -594,6 +595,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
diff --git a/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk
index 0557c56..a06f87d 100644
--- a/libjpeg.target.linux-x86_64.mk
+++ b/libjpeg.target.linux-x86_64.mk
@@ -301,6 +301,7 @@ MY_DEFS_Debug := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \
@@ -394,6 +395,7 @@ MY_DEFS_Release := \
 	'-DWITH_SIMD' \
 	'-DMOTION_JPEG_SUPPORTED' \
 	'-DNO_GETENV' \
+	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DANDROID' \