summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-31 21:02:28 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-31 21:02:28 +0000
commit421238e353fdd05cb442a340a55f68c48f44e202 (patch)
treef2400fb5ceb68d186598bf3c7239649a5ae17a9e
parent78d9f8c6003fb7ab5e24c681ef4b0dbfe4dfc3f3 (diff)
downloadlibyuv-421238e353fdd05cb442a340a55f68c48f44e202.tar.gz
Update makefiles after merge of Chromium at a41c404b1c7f
This commit was generated by merge_from_chromium.py. Change-Id: I5e3787681ea4c78f9d688812d397704be22c0300
-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 711b67f..f17c6ed 100644
--- a/libyuv.target.darwin-arm.mk
+++ b/libyuv.target.darwin-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk
index c5a7268..8a29ddb 100644
--- a/libyuv.target.darwin-arm64.mk
+++ b/libyuv.target.darwin-arm64.mk
@@ -104,6 +104,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -191,6 +192,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk
index 65cf13e..db6ea27 100644
--- a/libyuv.target.darwin-mips.mk
+++ b/libyuv.target.darwin-mips.mk
@@ -108,6 +108,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -200,6 +201,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk
index b5eb9b9..2de7189 100644
--- a/libyuv.target.darwin-x86.mk
+++ b/libyuv.target.darwin-x86.mk
@@ -110,6 +110,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -203,6 +204,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk
index b89a57e..ca227a2 100644
--- a/libyuv.target.darwin-x86_64.mk
+++ b/libyuv.target.darwin-x86_64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -201,6 +202,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk
index 711b67f..f17c6ed 100644
--- a/libyuv.target.linux-arm.mk
+++ b/libyuv.target.linux-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk
index c5a7268..8a29ddb 100644
--- a/libyuv.target.linux-arm64.mk
+++ b/libyuv.target.linux-arm64.mk
@@ -104,6 +104,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -191,6 +192,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk
index 65cf13e..db6ea27 100644
--- a/libyuv.target.linux-mips.mk
+++ b/libyuv.target.linux-mips.mk
@@ -108,6 +108,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -200,6 +201,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk
index b5eb9b9..2de7189 100644
--- a/libyuv.target.linux-x86.mk
+++ b/libyuv.target.linux-x86.mk
@@ -110,6 +110,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -203,6 +204,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk
index b89a57e..ca227a2 100644
--- a/libyuv.target.linux-x86_64.mk
+++ b/libyuv.target.linux-x86_64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -201,6 +202,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk
index 9f53079..dfaa4ff 100644
--- a/libyuv_neon.target.darwin-arm.mk
+++ b/libyuv_neon.target.darwin-arm.mk
@@ -93,6 +93,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -191,6 +192,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv_neon.target.darwin-arm64.mk b/libyuv_neon.target.darwin-arm64.mk
index 5ec19a8..05a02a4 100644
--- a/libyuv_neon.target.darwin-arm64.mk
+++ b/libyuv_neon.target.darwin-arm64.mk
@@ -81,6 +81,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -166,6 +167,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk
index 9f53079..dfaa4ff 100644
--- a/libyuv_neon.target.linux-arm.mk
+++ b/libyuv_neon.target.linux-arm.mk
@@ -93,6 +93,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -191,6 +192,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
diff --git a/libyuv_neon.target.linux-arm64.mk b/libyuv_neon.target.linux-arm64.mk
index 5ec19a8..05a02a4 100644
--- a/libyuv_neon.target.linux-arm64.mk
+++ b/libyuv_neon.target.linux-arm64.mk
@@ -81,6 +81,7 @@ MY_DEFS_Debug := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
@@ -166,6 +167,7 @@ MY_DEFS_Release := \
'-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \