summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-07-29 12:35:30 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-07-29 12:35:30 +0000
commit346651468f8e10a2f12fca26cbaa9ab5180f556a (patch)
tree1618e458977b60f424c824e68b17976e9bc0a0b0
parent2ba95622d3ac70d823b2dc5e92ec7cf51a175143 (diff)
downloadopenmax_dl-346651468f8e10a2f12fca26cbaa9ab5180f556a.tar.gz
Update makefiles after merge of Chromium at 286177
This commit was generated by merge_from_chromium.py. Change-Id: Ibd6b46c1ebf91994960210ae4316e7a9098363b8
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, 0 insertions, 24 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk
index ee2402b..96058ee 100644
--- a/dl/openmax_dl.target.darwin-arm.mk
+++ b/dl/openmax_dl.target.darwin-arm.mk
@@ -141,7 +141,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -248,7 +247,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk
index d00e829..0d3888c 100644
--- a/dl/openmax_dl.target.darwin-arm64.mk
+++ b/dl/openmax_dl.target.darwin-arm64.mk
@@ -95,7 +95,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -189,7 +188,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk
index 9d7a893..49ec075 100644
--- a/dl/openmax_dl.target.darwin-mips.mk
+++ b/dl/openmax_dl.target.darwin-mips.mk
@@ -90,7 +90,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -192,7 +191,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk
index 3e3c3ba..ea25330 100644
--- a/dl/openmax_dl.target.darwin-x86.mk
+++ b/dl/openmax_dl.target.darwin-x86.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -209,7 +208,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk
index 010a9ca..8310de7 100644
--- a/dl/openmax_dl.target.darwin-x86_64.mk
+++ b/dl/openmax_dl.target.darwin-x86_64.mk
@@ -107,7 +107,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -207,7 +206,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk
index ee2402b..96058ee 100644
--- a/dl/openmax_dl.target.linux-arm.mk
+++ b/dl/openmax_dl.target.linux-arm.mk
@@ -141,7 +141,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -248,7 +247,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk
index d00e829..0d3888c 100644
--- a/dl/openmax_dl.target.linux-arm64.mk
+++ b/dl/openmax_dl.target.linux-arm64.mk
@@ -95,7 +95,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -189,7 +188,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk
index 9d7a893..49ec075 100644
--- a/dl/openmax_dl.target.linux-mips.mk
+++ b/dl/openmax_dl.target.linux-mips.mk
@@ -90,7 +90,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -192,7 +191,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk
index 3e3c3ba..ea25330 100644
--- a/dl/openmax_dl.target.linux-x86.mk
+++ b/dl/openmax_dl.target.linux-x86.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -209,7 +208,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk
index 010a9ca..8310de7 100644
--- a/dl/openmax_dl.target.linux-x86_64.mk
+++ b/dl/openmax_dl.target.linux-x86_64.mk
@@ -107,7 +107,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -207,7 +206,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk
index fa2da94..d01be0d 100644
--- a/dl/openmax_dl_armv7.target.darwin-arm.mk
+++ b/dl/openmax_dl_armv7.target.darwin-arm.mk
@@ -95,7 +95,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -200,7 +199,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index fa2da94..d01be0d 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -95,7 +95,6 @@ MY_DEFS_Debug := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -200,7 +199,6 @@ MY_DEFS_Release := \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:04:24 +0000