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

Unified Diff: components/os_crypt.gypi

Issue 2086123003: Move KWalletDBus util from the Password Manager to OSCrypt. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/components_tests.gyp ('k') | components/os_crypt/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/os_crypt.gypi
diff --git a/components/os_crypt.gypi b/components/os_crypt.gypi
index f9e6edd870a62a5e9e4978b655e2903a928f41fc..d33f2b7063c00d9667ee566690c505b04f527c89 100644
--- a/components/os_crypt.gypi
+++ b/components/os_crypt.gypi
@@ -50,27 +50,49 @@
},
},
}],
- ['OS=="linux" and chromeos!=1 and use_glib==1', {
+ ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus==1)', {
'sources': [
- 'os_crypt/key_storage_libsecret.cc',
- 'os_crypt/key_storage_libsecret.h',
'os_crypt/key_storage_linux.cc',
'os_crypt/key_storage_linux.h',
- 'os_crypt/libsecret_util_linux.cc',
- 'os_crypt/libsecret_util_linux.h',
'os_crypt/os_crypt_linux.cc',
],
'sources!': [
'os_crypt/os_crypt_posix.cc',
],
- 'defines': [
- 'USE_LIBSECRET',
- ],
- 'include_dirs' : [
- '../third_party/libsecret/'
- ],
- 'dependencies': [
- '../build/linux/system.gyp:glib',
+ 'conditions': [
+ ['use_glib==1', {
+ 'sources': [
+ 'os_crypt/key_storage_libsecret.cc',
+ 'os_crypt/key_storage_libsecret.h',
+ 'os_crypt/libsecret_util_linux.cc',
+ 'os_crypt/libsecret_util_linux.h',
+ ],
+ 'defines': [
+ 'USE_LIBSECRET',
+ ],
+ 'include_dirs' : [
+ '../third_party/libsecret/'
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:glib',
+ ],
+ }],
+ ['use_dbus==1', {
+ 'sources': [
+ 'os_crypt/kwallet_dbus.cc',
+ 'os_crypt/kwallet_dbus.h',
+ ],
+ 'defines': [
+ 'USE_KWALLET',
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../dbus/dbus.gyp:dbus',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ }]
],
}],
],
@@ -95,7 +117,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- ['OS=="linux" and chromeos!=1 and use_glib==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 »

Powered by Google App Engine
This is Rietveld 408576698