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

Side by Side Diff: components/os_crypt/BUILD.gn

Issue 2244653002: gn: Use a separate flag for enabling libgnome-keyring support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch v2, drop unnecessary import Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/os_crypt/features.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//build/config/linux/pkg_config.gni") 7 import("//build/config/linux/pkg_config.gni")
8 import("//components/os_crypt/features.gni")
8 9
9 if (is_desktop_linux) { 10 if (use_gnome_keyring) {
10 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config 11 # Gnome-keyring is normally dynamically loaded. The gnome_keyring config
11 # will set this up. 12 # will set this up.
12 pkg_config("gnome_keyring") { 13 pkg_config("gnome_keyring") {
13 packages = [ "gnome-keyring-1" ] 14 packages = [ "gnome-keyring-1" ]
14 defines = [ "USE_GNOME_KEYRING" ] 15 defines = [ "USE_GNOME_KEYRING" ]
15 ignore_libs = true 16 ignore_libs = true
16 } 17 }
17 18
18 # If you want to link gnome-keyring directly (use only for unit tests) 19 # If you want to link gnome-keyring directly (use only for unit tests)
19 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a 20 # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 70
70 if (is_desktop_linux) { 71 if (is_desktop_linux) {
71 sources -= [ "os_crypt_posix.cc" ] 72 sources -= [ "os_crypt_posix.cc" ]
72 sources += [ 73 sources += [
73 "key_storage_linux.cc", 74 "key_storage_linux.cc",
74 "key_storage_linux.h", 75 "key_storage_linux.h",
75 "os_crypt_linux.cc", 76 "os_crypt_linux.cc",
76 ] 77 ]
77 defines = [] 78 defines = []
78 79
80 if (use_gnome_keyring) {
81 sources += [
82 "keyring_util_linux.cc",
83 "keyring_util_linux.h",
84 ]
85 configs += [ ":gnome_keyring" ]
86 }
79 if (use_glib) { 87 if (use_glib) {
80 sources += [ 88 sources += [
81 "key_storage_libsecret.cc", 89 "key_storage_libsecret.cc",
82 "key_storage_libsecret.h", 90 "key_storage_libsecret.h",
83 "keyring_util_linux.cc",
84 "keyring_util_linux.h",
85 "libsecret_util_linux.cc", 91 "libsecret_util_linux.cc",
86 "libsecret_util_linux.h", 92 "libsecret_util_linux.h",
87 ] 93 ]
88 configs += [ 94 configs += [ "//build/config/linux:glib" ]
89 "//build/config/linux:glib",
90 ":gnome_keyring",
91 ]
92 deps += [ "//third_party/libsecret" ] 95 deps += [ "//third_party/libsecret" ]
93 defines += [ "USE_LIBSECRET" ] 96 defines += [ "USE_LIBSECRET" ]
94 } 97 }
95 if (use_dbus) { 98 if (use_dbus) {
96 sources += [ 99 sources += [
97 "key_storage_kwallet.cc", 100 "key_storage_kwallet.cc",
98 "key_storage_kwallet.h", 101 "key_storage_kwallet.h",
99 "kwallet_dbus.cc", 102 "kwallet_dbus.cc",
100 "kwallet_dbus.h", 103 "kwallet_dbus.h",
101 ] 104 ]
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 if (use_dbus) { 162 if (use_dbus) {
160 sources += [ 163 sources += [
161 "key_storage_kwallet_unittest.cc", 164 "key_storage_kwallet_unittest.cc",
162 "kwallet_dbus_unittest.cc", 165 "kwallet_dbus_unittest.cc",
163 ] 166 ]
164 deps += [ "//dbus:test_support" ] 167 deps += [ "//dbus:test_support" ]
165 defines += [ "USE_KWALLET" ] 168 defines += [ "USE_KWALLET" ]
166 } 169 }
167 } 170 }
168 } 171 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/os_crypt/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698