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

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

Issue 2117323002: Disable Linux key storage for non-glib builds (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 unified diff | Download patch
« no previous file with comments | « components/os_crypt.gypi ('k') | no next file » | 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 7
8 source_set("os_crypt") { 8 source_set("os_crypt") {
9 sources = [ 9 sources = [
10 "ie7_password_win.cc", 10 "ie7_password_win.cc",
(...skipping 26 matching lines...) Expand all
37 "keychain_password_mac.mm", 37 "keychain_password_mac.mm",
38 "os_crypt_mac.mm", 38 "os_crypt_mac.mm",
39 ] 39 ]
40 set_sources_assignment_filter(sources_assignment_filter) 40 set_sources_assignment_filter(sources_assignment_filter)
41 } 41 }
42 42
43 if (is_win) { 43 if (is_win) {
44 libs = [ "crypt32.lib" ] 44 libs = [ "crypt32.lib" ]
45 } 45 }
46 46
47 if (is_desktop_linux && (use_glib || use_dbus)) { 47 if (is_desktop_linux && (use_glib)) {
cfroussios 2016/07/07 10:59:50 I don't think this is where your problem starts. T
cfroussios 2016/07/07 11:05:29 I should clarify: just make KeyStorageLinux::Creat
48 sources -= [ "os_crypt_posix.cc" ] 48 sources -= [ "os_crypt_posix.cc" ]
49 sources += [ 49 sources += [
50 "key_storage_linux.cc", 50 "key_storage_linux.cc",
51 "key_storage_linux.h", 51 "key_storage_linux.h",
52 "os_crypt_linux.cc", 52 "os_crypt_linux.cc",
53 ] 53 ]
54 defines = [] 54 defines = []
55 55
56 if (use_glib) { 56 if (use_glib) {
57 sources += [ 57 sources += [
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 if (use_dbus) { 124 if (use_dbus) {
125 sources += [ "kwallet_dbus_unittest.cc" ] 125 sources += [ "kwallet_dbus_unittest.cc" ]
126 deps += [ 126 deps += [
127 "//dbus", 127 "//dbus",
128 "//dbus:test_support", 128 "//dbus:test_support",
129 ] 129 ]
130 defines += [ "USE_KWALLET" ] 130 defines += [ "USE_KWALLET" ]
131 } 131 }
132 } 132 }
133 } 133 }
OLDNEW
« no previous file with comments | « components/os_crypt.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698