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

Unified Diff: openssl.gyp

Issue 13979005: Only make OpenSSL a component for Android component builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: component on android Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl.gyp
diff --git a/openssl.gyp b/openssl.gyp
index 8dca186b5ad298b1e7aefb0ec550dc704fb02f70..f8b719146b0ceeec819d981c98c5c9e5c5764565 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -6,7 +6,7 @@
'targets': [
{
'target_name': 'openssl',
- 'type': '<(component)',
+ 'type': 'static_library',
'includes': [
# Include the auto-generated gypi file.
'../../third_party/openssl/openssl.gypi'
@@ -66,12 +66,12 @@
'openssl_include_dirs+': [ 'config/x64' ],
},
}],
- ['component == "shared_library"', {
- 'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
- 'cflags!': ['-fvisibility=hidden'],
- }],
- ],
+ ['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',
+ 'cflags!': ['-fvisibility=hidden'],
}],
['clang==1', {
'cflags': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698