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
commit868b13cba7e2936a09b06862b2d1f9983ba736a3 (patch)
treea160e2d2f902d737b7bd3abd5d1a62b5a9eb90f4
parentbd25c4e777ef2b42423080d18103835f45d620f6 (diff)
downloadopenmax_dl-868b13cba7e2936a09b06862b2d1f9983ba736a3.tar.gz
Update makefiles after merge of Chromium at a99b7ad25d02
This commit was generated by merge_from_chromium.py. Change-Id: Iffe5c2e1cc7e369426d52e87344dbce54311b004
Diffstat
-rw-r--r--dl/openmax_dl.target.darwin-arm.mk2
-rw-r--r--dl/openmax_dl.target.darwin-arm64.mk2
-rw-r--r--dl/openmax_dl.target.darwin-mips.mk2
-rw-r--r--dl/openmax_dl.target.darwin-x86.mk2
-rw-r--r--dl/openmax_dl.target.darwin-x86_64.mk2
-rw-r--r--dl/openmax_dl.target.linux-arm.mk2
-rw-r--r--dl/openmax_dl.target.linux-arm64.mk2
-rw-r--r--dl/openmax_dl.target.linux-mips.mk2
-rw-r--r--dl/openmax_dl.target.linux-x86.mk2
-rw-r--r--dl/openmax_dl.target.linux-x86_64.mk2
-rw-r--r--dl/openmax_dl_armv7.target.darwin-arm.mk2
-rw-r--r--dl/openmax_dl_armv7.target.linux-arm.mk2
12 files changed, 24 insertions, 0 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk
index 528c874..5734f92 100644
--- a/dl/openmax_dl.target.darwin-arm.mk
+++ b/dl/openmax_dl.target.darwin-arm.mk
@@ -147,6 +147,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -247,6 +248,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk
index b8a3a27..39626d8 100644
--- a/dl/openmax_dl.target.darwin-arm64.mk
+++ b/dl/openmax_dl.target.darwin-arm64.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -188,6 +189,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk
index f824469..35c8a00 100644
--- a/dl/openmax_dl.target.darwin-mips.mk
+++ b/dl/openmax_dl.target.darwin-mips.mk
@@ -93,6 +93,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -185,6 +186,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk
index 78969a8..88d81c3 100644
--- a/dl/openmax_dl.target.darwin-x86.mk
+++ b/dl/openmax_dl.target.darwin-x86.mk
@@ -113,6 +113,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -206,6 +207,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk
index b205893..c428a43 100644
--- a/dl/openmax_dl.target.darwin-x86_64.mk
+++ b/dl/openmax_dl.target.darwin-x86_64.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -204,6 +205,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk
index 528c874..5734f92 100644
--- a/dl/openmax_dl.target.linux-arm.mk
+++ b/dl/openmax_dl.target.linux-arm.mk
@@ -147,6 +147,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -247,6 +248,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk
index b8a3a27..39626d8 100644
--- a/dl/openmax_dl.target.linux-arm64.mk
+++ b/dl/openmax_dl.target.linux-arm64.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -188,6 +189,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk
index f824469..35c8a00 100644
--- a/dl/openmax_dl.target.linux-mips.mk
+++ b/dl/openmax_dl.target.linux-mips.mk
@@ -93,6 +93,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -185,6 +186,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk
index 78969a8..88d81c3 100644
--- a/dl/openmax_dl.target.linux-x86.mk
+++ b/dl/openmax_dl.target.linux-x86.mk
@@ -113,6 +113,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -206,6 +207,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk
index b205893..c428a43 100644
--- a/dl/openmax_dl.target.linux-x86_64.mk
+++ b/dl/openmax_dl.target.linux-x86_64.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -204,6 +205,7 @@ MY_DEFS_Release := \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
'-DBIG_FFT_TABLE' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk
index ee986f6..5cc77ee 100644
--- a/dl/openmax_dl_armv7.target.darwin-arm.mk
+++ b/dl/openmax_dl_armv7.target.darwin-arm.mk
@@ -100,6 +100,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/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index ee986f6..5cc77ee 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -100,6 +100,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' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 11:39:49 +0000