crypto/crypto.gyp - Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Final fixes and nits Created 6 years, 9 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

Index: crypto/crypto.gyp

diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp

index 23b29861c3f749773da4cede16f2aeffeb926758..ab19f69fb0361c6b419d1a7626596b6fa7b0f270 100644

--- a/crypto/crypto.gyp

+++ b/crypto/crypto.gyp

@@ -80,7 +80,7 @@

'mac_security_services_lock.h',

}],

- [ 'OS == "mac" or OS == "ios" or OS == "win"', {

+ [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {

'dependencies': [

'../third_party/nss/nss.gyp:nspr',

'../third_party/nss/nss.gyp:nss',

@@ -201,12 +201,7 @@

'openpgp_symmetric_encryption_unittest.cc',

]

}],

- [ 'OS == "mac" or OS == "ios" or OS == "win"', {

- 'dependencies': [

- '../third_party/nss/nss.gyp:nss',

- ],

- }],

- [ 'OS == "mac"', {

+ [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {

'dependencies': [

'../third_party/nss/nss.gyp:nspr',

« no previous file with comments | « build/common.gypi ('k') | crypto/encryptor.h » ('j') | no next file with comments »