diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:56 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:56 +0100 |
commit | cf9e44ef952b1a6a2ff9738a1cdd6283fb3f6898 (patch) | |
tree | f8238bbaebff9aea1e5029219a597428812d0765 | |
parent | a3c8d4e0e27f55f266f3518886e623ace2762ae3 (diff) | |
parent | 945bc2ac9a955be1b128506049dd828b217da739 (diff) | |
download | openssl-cf9e44ef952b1a6a2ff9738a1cdd6283fb3f6898.tar.gz |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Iec3a8d81a68a5c29672c64d8b8408fa7111fdf38
-rw-r--r-- | openssl.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | openssl.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | openssl.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | openssl.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | openssl.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | openssl.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | openssl.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | openssl.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | openssl.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index b44c4a8..f1ebd9c 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -640,6 +640,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -743,6 +744,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk index ca8aefa..093bfc9 100644 --- a/openssl.target.darwin-arm64.mk +++ b/openssl.target.darwin-arm64.mk @@ -628,6 +628,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -721,6 +722,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 55a213f..52b0be8 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -635,6 +635,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -736,6 +737,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 93bc202..5ebaa58 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -641,6 +641,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -750,6 +751,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk index 07bd9e3..cf24e4b 100644 --- a/openssl.target.darwin-x86_64.mk +++ b/openssl.target.darwin-x86_64.mk @@ -644,6 +644,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -753,6 +754,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index b44c4a8..f1ebd9c 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -640,6 +640,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -743,6 +744,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk index ca8aefa..093bfc9 100644 --- a/openssl.target.linux-arm64.mk +++ b/openssl.target.linux-arm64.mk @@ -628,6 +628,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -721,6 +722,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 55a213f..52b0be8 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -635,6 +635,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -736,6 +737,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 93bc202..5ebaa58 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -641,6 +641,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -750,6 +751,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 07bd9e3..cf24e4b 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -644,6 +644,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -753,6 +754,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ |