summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-31 19:08:28 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-31 19:08:28 +0000
commit46c94329b235781e42d8320abf8112a1388d510f (patch)
tree0fd03aa616c5e51f136f51e3cecbe16c56bab151
parent5d6118b3f1fc518defe6db8932a64359a9b3b2bd (diff)
downloadopenmax_dl-46c94329b235781e42d8320abf8112a1388d510f.tar.gz
Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py. Change-Id: Iacf2859d286f9cb9aa2516be12f3a79af2cbef25
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 f39e836..84d09d4 100644
--- a/dl/openmax_dl.target.darwin-arm.mk
+++ b/dl/openmax_dl.target.darwin-arm.mk
@@ -137,6 +137,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -235,6 +236,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk
index b033a0d..63d2c8a 100644
--- a/dl/openmax_dl.target.darwin-arm64.mk
+++ b/dl/openmax_dl.target.darwin-arm64.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -176,6 +177,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk
index 057442d..c4c234b 100644
--- a/dl/openmax_dl.target.darwin-mips.mk
+++ b/dl/openmax_dl.target.darwin-mips.mk
@@ -83,6 +83,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -173,6 +174,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk
index 41ca555..2e1b9b7 100644
--- a/dl/openmax_dl.target.darwin-x86.mk
+++ b/dl/openmax_dl.target.darwin-x86.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -194,6 +195,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk
index 1af29f9..6437d75 100644
--- a/dl/openmax_dl.target.darwin-x86_64.mk
+++ b/dl/openmax_dl.target.darwin-x86_64.mk
@@ -102,6 +102,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -192,6 +193,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk
index f39e836..84d09d4 100644
--- a/dl/openmax_dl.target.linux-arm.mk
+++ b/dl/openmax_dl.target.linux-arm.mk
@@ -137,6 +137,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -235,6 +236,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk
index b033a0d..63d2c8a 100644
--- a/dl/openmax_dl.target.linux-arm64.mk
+++ b/dl/openmax_dl.target.linux-arm64.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -176,6 +177,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk
index 057442d..c4c234b 100644
--- a/dl/openmax_dl.target.linux-mips.mk
+++ b/dl/openmax_dl.target.linux-mips.mk
@@ -83,6 +83,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -173,6 +174,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk
index 41ca555..2e1b9b7 100644
--- a/dl/openmax_dl.target.linux-x86.mk
+++ b/dl/openmax_dl.target.linux-x86.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -194,6 +195,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk
index 1af29f9..6437d75 100644
--- a/dl/openmax_dl.target.linux-x86_64.mk
+++ b/dl/openmax_dl.target.linux-x86_64.mk
@@ -102,6 +102,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -192,6 +193,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk
index 59be285..df825e8 100644
--- a/dl/openmax_dl_armv7.target.darwin-arm.mk
+++ b/dl/openmax_dl_armv7.target.darwin-arm.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -187,6 +188,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index 59be285..df825e8 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
@@ -187,6 +188,7 @@ MY_DEFS_Release := \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:41:38 +0000