diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
commit | 0de6073388f4e2780db8536178b129cd8f6ab386 (patch) | |
tree | f22df67d2450c33e245fa27d50f001b403434315 /sdch | |
parent | 237b4e8281feb4bb44a23557a97fcbbd55133d68 (diff) | |
download | chromium_org-0de6073388f4e2780db8536178b129cd8f6ab386.tar.gz |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
Diffstat (limited to 'sdch')
-rw-r--r-- | sdch/sdch.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | sdch/sdch.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/sdch/sdch.target.darwin-arm.mk b/sdch/sdch.target.darwin-arm.mk index 9e701ee6cb..c9cb821ad5 100644 --- a/sdch/sdch.target.darwin-arm.mk +++ b/sdch/sdch.target.darwin-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.darwin-arm64.mk b/sdch/sdch.target.darwin-arm64.mk index 8af3f92825..240ddeeab2 100644 --- a/sdch/sdch.target.darwin-arm64.mk +++ b/sdch/sdch.target.darwin-arm64.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.darwin-mips.mk b/sdch/sdch.target.darwin-mips.mk index 1330470326..f4f6fcea07 100644 --- a/sdch/sdch.target.darwin-mips.mk +++ b/sdch/sdch.target.darwin-mips.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.darwin-x86.mk b/sdch/sdch.target.darwin-x86.mk index 88c0bab47b..189f92e6c9 100644 --- a/sdch/sdch.target.darwin-x86.mk +++ b/sdch/sdch.target.darwin-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.darwin-x86_64.mk b/sdch/sdch.target.darwin-x86_64.mk index 59b06b6d02..47e6ad79aa 100644 --- a/sdch/sdch.target.darwin-x86_64.mk +++ b/sdch/sdch.target.darwin-x86_64.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.linux-arm.mk b/sdch/sdch.target.linux-arm.mk index 9e701ee6cb..c9cb821ad5 100644 --- a/sdch/sdch.target.linux-arm.mk +++ b/sdch/sdch.target.linux-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.linux-arm64.mk b/sdch/sdch.target.linux-arm64.mk index 8af3f92825..240ddeeab2 100644 --- a/sdch/sdch.target.linux-arm64.mk +++ b/sdch/sdch.target.linux-arm64.mk @@ -87,6 +87,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.linux-mips.mk b/sdch/sdch.target.linux-mips.mk index 1330470326..f4f6fcea07 100644 --- a/sdch/sdch.target.linux-mips.mk +++ b/sdch/sdch.target.linux-mips.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.linux-x86.mk b/sdch/sdch.target.linux-x86.mk index 88c0bab47b..189f92e6c9 100644 --- a/sdch/sdch.target.linux-x86.mk +++ b/sdch/sdch.target.linux-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/sdch/sdch.target.linux-x86_64.mk b/sdch/sdch.target.linux-x86_64.mk index 59b06b6d02..47e6ad79aa 100644 --- a/sdch/sdch.target.linux-x86_64.mk +++ b/sdch/sdch.target.linux-x86_64.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ |