Index: openssl.gyp |
diff --git a/openssl.gyp b/openssl.gyp |
index 44061559ef9a9078ee4566f1e9a7c28010bb7dd0..1ee6d925a4f7b92f4cde0b601fcd438e5188580c 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', |
], |
}, |
}, |