diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-04-15 16:44:22 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-04-15 16:44:22 +0000 |
| commit | 0991a83e4577214d056fe12c673bfde172cbf8f8 (patch) | |
| tree | 72c3f9b757b4ca9dfa6ffeacc586f5a76ff48207 | |
| parent | 5bd6e0516e7862af183eec10dc90ceb086a6062f (diff) | |
| download | openssl-0991a83e4577214d056fe12c673bfde172cbf8f8.tar.gz | |
Only make OpenSSL a component for Android component builds.
Fixes an issue with attempted roll see on linux_clang:
http://build.chromium.org/p/tryserver.chromium/builders/linux_clang/builds/97781
BUG=158821
Review URL: https://codereview.chromium.org/13979005
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@194187 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | openssl.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openssl.gyp b/openssl.gyp index 8dca186..f8b7191 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': [ |