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

Side by Side Diff: crypto/crypto.gyp

Issue 6962044: Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'crypto', 11 'target_name': 'crypto',
12 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto 12 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto
13 'type': 'static_library', 13 'type': 'static_library',
14 'dependencies': [ 14 'dependencies': [
15 '../base/base.gyp:base', 15 '../base/base.gyp:base',
16 ], 16 ],
17 'msvs_disabled_warnings': [ 17 'msvs_disabled_warnings': [
18 4018, 18 4018,
19 ], 19 ],
20 'conditions': [ 20 'conditions': [
21 [ 'os_posix == 1 and OS != "mac"', { 21 [ 'os_posix == 1 and OS != "mac"', {
22 'dependencies': [
23 '../build/linux/system.gyp:ssl',
24 ],
25 'export_dependent_settings': [
26 '../build/linux/system.gyp:ssl',
27 ],
22 'conditions': [ 28 'conditions': [
23 [ 'chromeos==1', { 29 [ 'chromeos==1', {
24 'sources/': [ ['include', '_chromeos\\.cc$'] ] 30 'sources/': [ ['include', '_chromeos\\.cc$'] ]
25 }, 31 },
26 ], 32 ],
27 [ 'use_openssl==1', {
28 'dependencies': [
29 '../third_party/openssl/openssl.gyp:openssl',
30 ],
31 }, { # use_openssl==0
32 'dependencies': [
33 '../build/linux/system.gyp:nss',
34 ],
35 'export_dependent_settings': [
36 '../build/linux/system.gyp:nss',
37 ],
38 }
39 ],
40 ], 33 ],
41 }, { # os_posix != 1 or OS == "mac" 34 }, { # os_posix != 1 or OS == "mac"
42 'sources/': [ 35 'sources/': [
43 ['exclude', '_nss\.cc$'], 36 ['exclude', '_nss\.cc$'],
44 ], 37 ],
45 }], 38 }],
46 [ 'OS == "freebsd" or OS == "openbsd"', { 39 [ 'OS == "freebsd" or OS == "openbsd"', {
47 'link_settings': { 40 'link_settings': {
48 'libraries': [ 41 'libraries': [
49 '-L/usr/local/lib -lexecinfo', 42 '-L/usr/local/lib -lexecinfo',
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 [ 'os_posix == 1 and OS != "mac"', { 188 [ 'os_posix == 1 and OS != "mac"', {
196 'conditions': [ 189 'conditions': [
197 [ 'linux_use_tcmalloc==1', { 190 [ 'linux_use_tcmalloc==1', {
198 'dependencies': [ 191 'dependencies': [
199 '../base/allocator/allocator.gyp:allocator', 192 '../base/allocator/allocator.gyp:allocator',
200 ], 193 ],
201 }, 194 },
202 ], 195 ],
203 ], 196 ],
204 'dependencies': [ 197 'dependencies': [
205 '../build/linux/system.gyp:nss', 198 '../build/linux/system.gyp:ssl',
206 ], 199 ],
207 }, { # os_posix != 1 or OS == "mac" 200 }, { # os_posix != 1 or OS == "mac"
208 'sources!': [ 201 'sources!': [
209 'rsa_private_key_nss_unittest.cc', 202 'rsa_private_key_nss_unittest.cc',
210 ] 203 ]
211 }], 204 }],
212 [ 'OS == "mac" or OS == "win"', { 205 [ 'OS == "mac" or OS == "win"', {
213 'dependencies': [ 206 'dependencies': [
214 '../third_party/nss/nss.gyp:nss', 207 '../third_party/nss/nss.gyp:nss',
215 ], 208 ],
216 }], 209 }],
217 [ 'use_openssl==1', { 210 [ 'use_openssl==1', {
218 'sources!': [ 211 'sources!': [
219 'rsa_private_key_nss_unittest.cc', 212 'rsa_private_key_nss_unittest.cc',
220 ], 213 ],
221 }], 214 }],
222 ], 215 ],
223 }, 216 },
224 ], 217 ],
225 } 218 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698