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', |