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

Side by Side Diff: crypto/crypto.gyp

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back nss and nspr dependencies for crypto_unittests. Created 6 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 unified diff | Download patch
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'crypto.gypi', 10 'crypto.gypi',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ], 73 ],
74 }, 74 },
75 }, { # OS != "mac" 75 }, { # OS != "mac"
76 'sources!': [ 76 'sources!': [
77 'cssm_init.cc', 77 'cssm_init.cc',
78 'cssm_init.h', 78 'cssm_init.h',
79 'mac_security_services_lock.cc', 79 'mac_security_services_lock.cc',
80 'mac_security_services_lock.h', 80 'mac_security_services_lock.h',
81 ], 81 ],
82 }], 82 }],
83 [ 'OS == "mac" or OS == "ios" or OS == "win"', { 83 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
84 'dependencies': [ 84 'dependencies': [
85 '../third_party/nss/nss.gyp:nspr', 85 '../third_party/nss/nss.gyp:nspr',
86 '../third_party/nss/nss.gyp:nss', 86 '../third_party/nss/nss.gyp:nss',
87 ], 87 ],
88 'export_dependent_settings': [ 88 'export_dependent_settings': [
89 '../third_party/nss/nss.gyp:nspr', 89 '../third_party/nss/nss.gyp:nspr',
90 '../third_party/nss/nss.gyp:nss', 90 '../third_party/nss/nss.gyp:nss',
91 ], 91 ],
92 }], 92 }],
93 [ 'OS != "win"', { 93 [ 'OS != "win"', {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 ], 191 ],
192 }, 192 },
193 ], 193 ],
194 ], 194 ],
195 'dependencies': [ 195 'dependencies': [
196 '../build/linux/system.gyp:ssl', 196 '../build/linux/system.gyp:ssl',
197 ], 197 ],
198 }, { # os_posix != 1 or OS == "mac" or OS == "android" or OS == "ios" 198 }, { # os_posix != 1 or OS == "mac" or OS == "android" or OS == "ios"
199 'sources!': [ 199 'sources!': [
200 'rsa_private_key_nss_unittest.cc', 200 'rsa_private_key_nss_unittest.cc',
201 'openpgp_symmetric_encryption_unittest.cc', 201 'openpgp_symmetric_encryption_unittest.cc',
wtc 2014/03/27 17:40:18 I believe openpgp_symmetric_encryption_unittest.cc
wtc 2014/03/27 18:26:25 I was wrong. openpgp_symmetric_encryption_unittest
202 ] 202 ]
203 }], 203 }],
204 [ 'OS == "mac" or OS == "ios" or OS == "win"', { 204 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
205 'dependencies': [ 205 'dependencies': [
206 '../third_party/nss/nss.gyp:nss', 206 '../third_party/nss/nss.gyp:nss',
wtc 2014/03/27 17:40:18 I misunderstood what export_dependent_settings mea
haavardm 2014/03/27 21:10:58 Done. It still confuses me why nspr is needed fo
wtc 2014/03/27 21:16:03 I forgot to answer that question. src/base/third_p
207 ], 207 ],
208 }], 208 }],
209 [ 'OS == "mac"', { 209 [ 'use_openssl == 0 and OS == "mac"', {
210 'dependencies': [ 210 'dependencies': [
211 '../third_party/nss/nss.gyp:nspr', 211 '../third_party/nss/nss.gyp:nspr',
212 ], 212 ],
213 }], 213 }],
214 [ 'OS == "win"', { 214 [ 'OS == "win"', {
215 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 215 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
216 'msvs_disabled_warnings': [4267, ], 216 'msvs_disabled_warnings': [4267, ],
217 }], 217 }],
218 [ 'use_openssl==1', { 218 [ 'use_openssl==1', {
219 'sources!': [ 219 'sources!': [
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'configurations': { 251 'configurations': {
252 'Common_Base': { 252 'Common_Base': {
253 'msvs_target_platform': 'x64', 253 'msvs_target_platform': 'x64',
254 }, 254 },
255 }, 255 },
256 }, 256 },
257 ], 257 ],
258 }], 258 }],
259 ], 259 ],
260 } 260 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | crypto/encryptor.h » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698