OpenSSL: forward to BoringSSL.
This change will sit in the OpenSSL deps repo. When we switch to BoringSSL,
that patch will update DEPS to point to this revision. This avoids having to
update webrtc and libjingle repos at the same time.
The NaCl build is removed because I believe that all the pointers to it are in
the main Chromium repo and can be switched over. I'd rather get a clear build
error than linking in both OpenSSL and BoringSSL. (Also, forwarding doesn't
appear to work for NaCl targets.)
BUG=393317
https://codereview.chromium.org/383273002/
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@283025 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/openssl.gyp b/openssl.gyp
index 4406155..1ee6d92 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -6,117 +6,13 @@
'targets': [
{
'target_name': 'openssl',
- 'type': '<(component)',
- 'includes': [
- # Include the auto-generated gypi file.
- 'openssl.gypi'
- ],
- 'variables': {
- 'openssl_include_dirs': [
- '.',
- 'openssl',
- 'openssl/crypto',
- 'openssl/crypto/asn1',
- 'openssl/crypto/evp',
- 'openssl/crypto/modes',
- 'openssl/include',
- ],
- 'openssl_public_include_dirs': [
- 'openssl/include',
- ],
- },
- 'sources': [
- '<@(openssl_common_sources)',
- ],
- 'defines': [
- '<@(openssl_common_defines)',
- 'PURIFY',
- 'MONOLITH',
- 'OPENSSL_NO_ASM',
- ],
- 'defines!': [
- 'TERMIO',
- ],
- 'conditions': [
- ['os_posix==1 and OS!="android"', {
- 'defines': [
- # ENGINESDIR must be defined if OPENSSLDIR is.
- 'ENGINESDIR="/dev/null"',
- # Set to ubuntu default path for convenience. If necessary, override
- # this at runtime with the SSL_CERT_DIR environment variable.
- 'OPENSSLDIR="/etc/ssl"',
- ],
- }],
- ['target_arch == "arm"', {
- 'sources': [ '<@(openssl_arm_sources)' ],
- 'sources!': [ '<@(openssl_arm_source_excludes)' ],
- 'defines': [ '<@(openssl_arm_defines)' ],
- 'defines!': [ 'OPENSSL_NO_ASM' ],
- }],
- ['target_arch == "mipsel"', {
- 'sources': [ '<@(openssl_mips_sources)' ],
- 'sources!': [ '<@(openssl_mips_source_excludes)' ],
- 'defines': [ '<@(openssl_mips_defines)' ],
- 'defines!': [ 'OPENSSL_NO_ASM' ],
- }],
- ['target_arch == "ia32" and OS !="mac"', {
- 'sources': [ '<@(openssl_x86_sources)' ],
- 'sources!': [ '<@(openssl_x86_source_excludes)' ],
- 'defines': [ '<@(openssl_x86_defines)' ],
- 'defines!': [ 'OPENSSL_NO_ASM' ],
- }],
- ['target_arch == "ia32" and OS == "mac"', {
- 'sources': [ '<@(openssl_mac_ia32_sources)' ],
- 'sources!': [ '<@(openssl_mac_ia32_source_excludes)' ],
- 'defines': [ '<@(openssl_mac_ia32_defines)' ],
- 'defines!': [ 'OPENSSL_NO_ASM' ],
- 'variables': {
- # Ensure the 32-bit opensslconf.h header for OS X is used.
- 'openssl_include_dirs+': [ 'config/mac/ia32' ],
- 'openssl_public_include_dirs+': [ 'config/mac/ia32' ],
- },
- 'xcode_settings': {
- # Clang needs this to understand the inline assembly keyword 'asm'.
- 'GCC_C_LANGUAGE_STANDARD': 'gnu99',
- },
- }],
- ['target_arch == "x64"', {
- 'sources': [ '<@(openssl_x86_64_sources)' ],
- 'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
- 'defines': [ '<@(openssl_x86_64_defines)' ],
- 'defines!': [ 'OPENSSL_NO_ASM' ],
- 'variables': {
- # Ensure the 64-bit opensslconf.h header is used.
- 'openssl_include_dirs+': [ 'config/x64' ],
- 'openssl_public_include_dirs+': [ 'config/x64' ],
- },
- }],
- ['component == "shared_library"', {
- 'xcode_settings': {
- 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden
- },
- 'cflags!': ['-fvisibility=hidden'],
- }],
- ['clang==1', {
- 'cflags': [
- # OpenSSL has a few |if ((foo == NULL))| checks.
- '-Wno-parentheses-equality',
- # OpenSSL uses several function-style macros and then ignores the
- # returned value.
- '-Wno-unused-value',
- ],
- }, { # Not clang. Disable all warnings.
- 'cflags': [
- '-w',
- ],
- }]
- ],
- 'include_dirs': [
- '<@(openssl_include_dirs)',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../boringssl/boringssl.gyp:boringssl',
],
'direct_dependent_settings': {
'include_dirs': [
- '<@(openssl_public_include_dirs)',
+ '../boringssl/src/include',
],
},
},
diff --git a/openssl_nacl.gyp b/openssl_nacl.gyp
deleted file mode 100644
index 5129ef3..0000000
--- a/openssl_nacl.gyp
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'includes': [
- '../../native_client/build/untrusted.gypi',
- ],
- 'targets': [
- {
- 'target_name': 'openssl_nacl',
- 'type': 'none',
- 'variables': {
- 'nlib_target': 'libopenssl_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_pnacl_newlib': 1,
- 'defines!': [
- '_XOPEN_SOURCE=600',
- ],
- },
- 'dependencies': [
- '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
- ],
- 'includes': [
- # Include the auto-generated gypi file.
- 'openssl.gypi'
- ],
- 'sources': [
- '<@(openssl_common_sources)',
- ],
- 'defines': [
- '<@(openssl_common_defines)',
- 'MONOLITH',
- 'NO_SYS_UN_H',
- 'NO_SYSLOG',
- 'OPENSSL_NO_ASM',
- 'PURIFY',
- 'TERMIOS',
- 'SSIZE_MAX=INT_MAX',
- ],
- 'defines!': [
- 'TERMIO',
- ],
- 'include_dirs': [
- '.',
- 'openssl',
- 'openssl/crypto',
- 'openssl/crypto/asn1',
- 'openssl/crypto/evp',
- 'openssl/crypto/modes',
- 'openssl/include',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- 'openssl/include',
- ],
- },
- 'pnacl_compile_flags': [
- '-Wno-sometimes-uninitialized',
- '-Wno-unused-variable',
- ],
- }, # target openssl_nacl
- ],
-}
