summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-11-04 16:56:54 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-11-04 16:56:54 +0000
commitba0c3085ab90d72f9ecb87c6f6abed49766d08de (patch)
tree40aaff3dedea3a62d4f1c692e3a2fa0dd910c955
parent421238e353fdd05cb442a340a55f68c48f44e202 (diff)
downloadlibyuv-ba0c3085ab90d72f9ecb87c6f6abed49766d08de.tar.gz
Update makefiles after merge of Chromium at a99b7ad25d02
This commit was generated by merge_from_chromium.py. Change-Id: I111e016085ec8ef890b66710da8667f08733592a
Diffstat
-rw-r--r--libyuv.target.darwin-arm.mk2
-rw-r--r--libyuv.target.darwin-arm64.mk2
-rw-r--r--libyuv.target.darwin-mips.mk2
-rw-r--r--libyuv.target.darwin-x86.mk2
-rw-r--r--libyuv.target.darwin-x86_64.mk2
-rw-r--r--libyuv.target.linux-arm.mk2
-rw-r--r--libyuv.target.linux-arm64.mk2
-rw-r--r--libyuv.target.linux-mips.mk2
-rw-r--r--libyuv.target.linux-x86.mk2
-rw-r--r--libyuv.target.linux-x86_64.mk2
-rw-r--r--libyuv_neon.target.darwin-arm.mk2
-rw-r--r--libyuv_neon.target.darwin-arm64.mk2
-rw-r--r--libyuv_neon.target.linux-arm.mk2
-rw-r--r--libyuv_neon.target.linux-arm64.mk2
14 files changed, 28 insertions, 0 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk
index f17c6ed..68634da 100644
--- a/libyuv.target.darwin-arm.mk
+++ b/libyuv.target.darwin-arm.mk
@@ -122,6 +122,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -222,6 +223,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk
index 8a29ddb..ccfe75b 100644
--- a/libyuv.target.darwin-arm64.mk
+++ b/libyuv.target.darwin-arm64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk
index db6ea27..04902ff 100644
--- a/libyuv.target.darwin-mips.mk
+++ b/libyuv.target.darwin-mips.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -208,6 +209,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk
index 2de7189..a6214dd 100644
--- a/libyuv.target.darwin-x86.mk
+++ b/libyuv.target.darwin-x86.mk
@@ -117,6 +117,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -211,6 +212,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk
index ca227a2..3c1e566 100644
--- a/libyuv.target.darwin-x86_64.mk
+++ b/libyuv.target.darwin-x86_64.mk
@@ -116,6 +116,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -209,6 +210,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk
index f17c6ed..68634da 100644
--- a/libyuv.target.linux-arm.mk
+++ b/libyuv.target.linux-arm.mk
@@ -122,6 +122,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -222,6 +223,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk
index 8a29ddb..ccfe75b 100644
--- a/libyuv.target.linux-arm64.mk
+++ b/libyuv.target.linux-arm64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk
index db6ea27..04902ff 100644
--- a/libyuv.target.linux-mips.mk
+++ b/libyuv.target.linux-mips.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -208,6 +209,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk
index 2de7189..a6214dd 100644
--- a/libyuv.target.linux-x86.mk
+++ b/libyuv.target.linux-x86.mk
@@ -117,6 +117,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -211,6 +212,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk
index ca227a2..3c1e566 100644
--- a/libyuv.target.linux-x86_64.mk
+++ b/libyuv.target.linux-x86_64.mk
@@ -116,6 +116,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -209,6 +210,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DHAVE_JPEG' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk
index dfaa4ff..3386632 100644
--- a/libyuv_neon.target.darwin-arm.mk
+++ b/libyuv_neon.target.darwin-arm.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv_neon.target.darwin-arm64.mk b/libyuv_neon.target.darwin-arm64.mk
index 05a02a4..4afa784 100644
--- a/libyuv_neon.target.darwin-arm64.mk
+++ b/libyuv_neon.target.darwin-arm64.mk
@@ -87,6 +87,7 @@ MY_DEFS_Debug := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -173,6 +174,7 @@ MY_DEFS_Release := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk
index dfaa4ff..3386632 100644
--- a/libyuv_neon.target.linux-arm.mk
+++ b/libyuv_neon.target.linux-arm.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/libyuv_neon.target.linux-arm64.mk b/libyuv_neon.target.linux-arm64.mk
index 05a02a4..4afa784 100644
--- a/libyuv_neon.target.linux-arm64.mk
+++ b/libyuv_neon.target.linux-arm64.mk
@@ -87,6 +87,7 @@ MY_DEFS_Debug := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -173,6 +174,7 @@ MY_DEFS_Release := \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:25:32 +0000