Index: openssl.gyp |
=================================================================== |
--- openssl.gyp (revision 194187) |
+++ openssl.gyp (working copy) |
@@ -6,7 +6,7 @@ |
'targets': [ |
{ |
'target_name': 'openssl', |
- 'type': 'static_library', |
+ 'type': '<(component)', |
'includes': [ |
# Include the auto-generated gypi file. |
'../../third_party/openssl/openssl.gypi' |
@@ -66,11 +66,7 @@ |
'openssl_include_dirs+': [ 'config/x64' ], |
}, |
}], |
- ['component == "shared_library" and OS=="android"', { |
- # On Android, build OpenSSL as a component. This is necessary as both |
- # crypto and net call into OpenSSL but it initializes some static |
- # state only once. However, this fails to compile on linux. |
- 'type': 'shared_library', |
+ ['component == "shared_library"', { |
'cflags!': ['-fvisibility=hidden'], |
}], |
['clang==1', { |