Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: openssl.gyp

Issue 16272007: Fix the shared_library build on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/openssl/
Patch Set: Describe the patch in README.chromium Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README.chromium ('k') | openssl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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', {
« no previous file with comments | « README.chromium ('k') | openssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698