components/os_crypt.gypi - Issue 2152493002: Revert of Forward password-store switch to OSCrypt component

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: components/os_crypt.gypi

Issue 2152493002: Revert of Forward password-store switch to OSCrypt component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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: components/os_crypt.gypi

diff --git a/components/os_crypt.gypi b/components/os_crypt.gypi

index 1d61f6b1b6310852ec0ee8707eb56f95d9c736f1..d33f2b7063c00d9667ee566690c505b04f527c89 100644

--- a/components/os_crypt.gypi

+++ b/components/os_crypt.gypi

@@ -50,7 +50,7 @@

}],

- ['OS=="linux" and chromeos!=1', {

+ ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus==1)', {

'sources': [

'os_crypt/key_storage_linux.cc',

'os_crypt/key_storage_linux.h',

@@ -117,7 +117,7 @@

'../testing/gtest.gyp:gtest',

'conditions': [

- ['OS=="linux" and chromeos!=1', {

+ ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus)', {

'sources': [

'os_crypt/os_crypt_mocker_linux.cc',

'os_crypt/os_crypt_mocker_linux.h',

« no previous file with comments | « components/components_tests.gyp ('k') | components/os_crypt/BUILD.gn » ('j') | no next file with comments »