chrome/chrome_utility.gypi - Issue 881213004: Support building BoringSSL with NSS certificates.

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: chrome/chrome_utility.gypi

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: slightly tidier (edit: looks like this'll need a rebase later for try jobs to run.) Created 5 years, 10 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:

Index: chrome/chrome_utility.gypi

diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi

index d986e14b44bc13baedd98ece6e0d36fc80ac6997..a0d134f350c65af471aeb2085ec8aafb46e0a41a 100644

--- a/chrome/chrome_utility.gypi

+++ b/chrome/chrome_utility.gypi

@@ -120,12 +120,12 @@

'<@(chrome_utility_sources)',

'conditions': [

- ['OS!="win" and OS!="mac" and use_openssl==1', {

- 'sources!': [

- 'utility/importer/nss_decryptor.cc',

- ]

+ ['OS!="android"', {

+ 'sources': [

+ '<@(chrome_utility_importer_sources)',

+ ],

}],

- ['OS!="win" and OS!="mac" and use_openssl==0', {

+ ['use_nss==1', {

'dependencies': [

'../crypto/crypto.gyp:crypto',

@@ -134,11 +134,6 @@

'utility/importer/nss_decryptor_system_nss.h',

}],

- ['OS!="android"', {

- 'sources': [

- '<@(chrome_utility_importer_sources)',

- ],

- }],

['enable_extensions==1', {

'dependencies': [

'../extensions/extensions.gyp:extensions_utility',