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

Unified Diff: components/os_crypt/BUILD.gn

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/os_crypt.gypi ('k') | components/os_crypt/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/os_crypt/BUILD.gn
diff --git a/components/os_crypt/BUILD.gn b/components/os_crypt/BUILD.gn
index a349a00eb23e4facfbccf15f7263c96e5a21b05b..81da1116f068d618a05e887095c7381938c10128 100644
--- a/components/os_crypt/BUILD.gn
+++ b/components/os_crypt/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/features.gni")
import("//build/config/ui.gni")
source_set("os_crypt") {
@@ -43,20 +44,34 @@ source_set("os_crypt") {
libs = [ "crypt32.lib" ]
}
- if (is_desktop_linux && use_glib) {
+ if (is_desktop_linux && (use_glib || use_dbus)) {
sources -= [ "os_crypt_posix.cc" ]
sources += [
- "key_storage_libsecret.cc",
- "key_storage_libsecret.h",
"key_storage_linux.cc",
"key_storage_linux.h",
- "libsecret_util_linux.cc",
- "libsecret_util_linux.h",
"os_crypt_linux.cc",
]
- configs += [ "//build/config/linux:glib" ]
- deps += [ "//third_party/libsecret" ]
- defines = [ "USE_LIBSECRET" ]
+ defines = []
+
+ if (use_glib) {
+ sources += [
+ "key_storage_libsecret.cc",
+ "key_storage_libsecret.h",
+ "libsecret_util_linux.cc",
+ "libsecret_util_linux.h",
+ ]
+ configs += [ "//build/config/linux:glib" ]
+ deps += [ "//third_party/libsecret" ]
+ defines += [ "USE_LIBSECRET" ]
+ }
+ if (use_dbus) {
+ sources += [
+ "kwallet_dbus.cc",
+ "kwallet_dbus.h",
+ ]
+ deps += [ "//dbus" ]
+ defines += [ "USE_KWALLET" ]
+ }
}
}
@@ -71,7 +86,7 @@ source_set("test_support") {
"//base",
"//testing/gtest",
]
- if (is_desktop_linux && use_glib) {
+ if (is_desktop_linux && (use_glib || use_dbus)) {
sources += [
"os_crypt_mocker_linux.cc",
"os_crypt_mocker_linux.h",
@@ -93,15 +108,26 @@ source_set("unit_tests") {
":test_support",
"//base",
"//crypto",
+ "//testing/gmock",
"//testing/gtest",
]
- if (is_desktop_linux && use_glib) {
- sources += [
- "os_crypt_linux_unittest.cc",
- "os_crypt_util_linux_unittest.cc",
- ]
- deps += [ "//third_party/libsecret" ]
- defines = [ "USE_LIBSECRET" ]
+ if (is_desktop_linux && (use_glib || use_dbus)) {
+ sources += [ "os_crypt_linux_unittest.cc" ]
+ defines = []
+
+ if (use_glib) {
+ sources += [ "os_crypt_util_linux_unittest.cc" ]
+ deps += [ "//third_party/libsecret" ]
+ defines += [ "USE_LIBSECRET" ]
+ }
+ if (use_dbus) {
+ sources += [ "kwallet_dbus_unittest.cc" ]
+ deps += [
+ "//dbus",
+ "//dbus:test_support",
+ ]
+ defines += [ "USE_KWALLET" ]
+ }
}
}
« no previous file with comments | « components/os_crypt.gypi ('k') | components/os_crypt/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698