diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-09-06 11:42:33 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-09-06 11:42:33 +0000 |
| commit | 0f742e9f2ee6ed2960e0e99384b6113c9c39bb93 (patch) | |
| tree | 0fcb72f0c700a3606b3c990c0c24bd634cc90490 | |
| parent | b59c75f2336cf8e1ce73d685e233f0ed4a71a54d (diff) | |
| download | openssl-0f742e9f2ee6ed2960e0e99384b6113c9c39bb93.tar.gz | |
Update makefiles after merge of Chromium at r221681
This commit was generated by merge_from_chromium.py.
Change-Id: If0937d6793e8017c8ed1f0f4c817bd1ab26fbbe9
| -rw-r--r-- | openssl.target.darwin-arm.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.linux-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 38dd03d..d8ca735 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -629,6 +629,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -728,6 +729,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 34d264a..cb4ae3c 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -626,6 +626,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -722,6 +723,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 68e066b..04fc83a 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -634,6 +634,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -742,6 +743,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 38dd03d..d8ca735 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -629,6 +629,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -728,6 +729,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 34d264a..cb4ae3c 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -626,6 +626,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -722,6 +723,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 68e066b..04fc83a 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -634,6 +634,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -742,6 +743,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ |