summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:14 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:14 +0000
commit826b427d9a747e0aeb749eed2d4fc4323c9e569b (patch)
tree7734c764e917c4b0c400e9a97d38731f2be8809e
parente74dcd06df50f8a05903b509bc5bacba9af76e7d (diff)
downloadlibyuv-826b427d9a747e0aeb749eed2d4fc4323c9e569b.tar.gz
Update makefiles after merge of Chromium at 5a645aa13b82
This commit was generated by merge_from_chromium.py. Change-Id: Ieea0759d46f154d382faf88ec20a7e7eb538a07b
-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-mips64.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-mips64.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
16 files changed, 32 insertions, 0 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk
index 68634da..6b8f683 100644
--- a/libyuv.target.darwin-arm.mk
+++ b/libyuv.target.darwin-arm.mk
@@ -118,6 +118,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -219,6 +220,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk
index ccfe75b..517a8a6 100644
--- a/libyuv.target.darwin-arm64.mk
+++ b/libyuv.target.darwin-arm64.mk
@@ -107,6 +107,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk
index 04902ff..7b59e36 100644
--- a/libyuv.target.darwin-mips.mk
+++ b/libyuv.target.darwin-mips.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -205,6 +206,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.darwin-mips64.mk b/libyuv.target.darwin-mips64.mk
index 04902ff..7b59e36 100644
--- a/libyuv.target.darwin-mips64.mk
+++ b/libyuv.target.darwin-mips64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -205,6 +206,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk
index a6214dd..37f614f 100644
--- a/libyuv.target.darwin-x86.mk
+++ b/libyuv.target.darwin-x86.mk
@@ -113,6 +113,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -208,6 +209,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk
index 3c1e566..dcba1ac 100644
--- a/libyuv.target.darwin-x86_64.mk
+++ b/libyuv.target.darwin-x86_64.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -206,6 +207,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk
index 68634da..6b8f683 100644
--- a/libyuv.target.linux-arm.mk
+++ b/libyuv.target.linux-arm.mk
@@ -118,6 +118,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -219,6 +220,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk
index ccfe75b..517a8a6 100644
--- a/libyuv.target.linux-arm64.mk
+++ b/libyuv.target.linux-arm64.mk
@@ -107,6 +107,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk
index 04902ff..7b59e36 100644
--- a/libyuv.target.linux-mips.mk
+++ b/libyuv.target.linux-mips.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -205,6 +206,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-mips64.mk b/libyuv.target.linux-mips64.mk
index 04902ff..7b59e36 100644
--- a/libyuv.target.linux-mips64.mk
+++ b/libyuv.target.linux-mips64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -205,6 +206,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk
index a6214dd..37f614f 100644
--- a/libyuv.target.linux-x86.mk
+++ b/libyuv.target.linux-x86.mk
@@ -113,6 +113,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -208,6 +209,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk
index 3c1e566..dcba1ac 100644
--- a/libyuv.target.linux-x86_64.mk
+++ b/libyuv.target.linux-x86_64.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -206,6 +207,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk
index 3386632..52fcda4 100644
--- a/libyuv_neon.target.darwin-arm.mk
+++ b/libyuv_neon.target.darwin-arm.mk
@@ -96,6 +96,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv_neon.target.darwin-arm64.mk b/libyuv_neon.target.darwin-arm64.mk
index 4afa784..4750b60 100644
--- a/libyuv_neon.target.darwin-arm64.mk
+++ b/libyuv_neon.target.darwin-arm64.mk
@@ -84,6 +84,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk
index 3386632..52fcda4 100644
--- a/libyuv_neon.target.linux-arm.mk
+++ b/libyuv_neon.target.linux-arm.mk
@@ -96,6 +96,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -196,6 +197,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/libyuv_neon.target.linux-arm64.mk b/libyuv_neon.target.linux-arm64.mk
index 4afa784..4750b60 100644
--- a/libyuv_neon.target.linux-arm64.mk
+++ b/libyuv_neon.target.linux-arm64.mk
@@ -84,6 +84,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \