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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « README.chromium ('k') | openssl.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'openssl', 8 'target_name': 'openssl',
9 'type': 'static_library', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
11 # Include the auto-generated gypi file. 11 # Include the auto-generated gypi file.
12 '../../third_party/openssl/openssl.gypi' 12 '../../third_party/openssl/openssl.gypi'
13 ], 13 ],
14 'variables': { 14 'variables': {
15 'openssl_include_dirs': [ 15 'openssl_include_dirs': [
16 '.', 16 '.',
17 'openssl', 17 'openssl',
18 'openssl/crypto', 18 'openssl/crypto',
19 'openssl/crypto/asn1', 19 'openssl/crypto/asn1',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ['target_arch == "x64"', { 59 ['target_arch == "x64"', {
60 'sources': [ '<@(openssl_x86_64_sources)' ], 60 'sources': [ '<@(openssl_x86_64_sources)' ],
61 'sources!': [ '<@(openssl_x86_64_source_excludes)' ], 61 'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
62 'defines': [ '<@(openssl_x86_64_defines)' ], 62 'defines': [ '<@(openssl_x86_64_defines)' ],
63 'defines!': [ 'OPENSSL_NO_ASM' ], 63 'defines!': [ 'OPENSSL_NO_ASM' ],
64 'variables': { 64 'variables': {
65 # Ensure the 64-bit opensslconf.h header is used. 65 # Ensure the 64-bit opensslconf.h header is used.
66 'openssl_include_dirs+': [ 'config/x64' ], 66 'openssl_include_dirs+': [ 'config/x64' ],
67 }, 67 },
68 }], 68 }],
69 ['component == "shared_library" and OS=="android"', { 69 ['component == "shared_library"', {
70 # On Android, build OpenSSL as a component. This is necessary as both
71 # crypto and net call into OpenSSL but it initializes some static
72 # state only once. However, this fails to compile on linux.
73 'type': 'shared_library',
74 'cflags!': ['-fvisibility=hidden'], 70 'cflags!': ['-fvisibility=hidden'],
75 }], 71 }],
76 ['clang==1', { 72 ['clang==1', {
77 'cflags': [ 73 'cflags': [
78 # OpenSSL has a few |if ((foo == NULL))| checks. 74 # OpenSSL has a few |if ((foo == NULL))| checks.
79 '-Wno-parentheses-equality', 75 '-Wno-parentheses-equality',
80 # OpenSSL uses several function-style macros and then ignores the 76 # OpenSSL uses several function-style macros and then ignores the
81 # returned value. 77 # returned value.
82 '-Wno-unused-value', 78 '-Wno-unused-value',
83 ], 79 ],
(...skipping 13 matching lines...) Expand all
97 }, 93 },
98 }, 94 },
99 ], 95 ],
100 } 96 }
101 97
102 # Local Variables: 98 # Local Variables:
103 # tab-width:2 99 # tab-width:2
104 # indent-tabs-mode:nil 100 # indent-tabs-mode:nil
105 # End: 101 # End:
106 # vim: set expandtab tabstop=2 shiftwidth=2: 102 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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