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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « components/components_tests.gyp ('k') | components/os_crypt/BUILD.gn » ('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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'os_crypt', 8 'target_name': 'os_crypt',
9 'type': 'static_library', 9 'type': 'static_library',
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 }, 43 },
44 }, 44 },
45 'msvs_settings': { 45 'msvs_settings': {
46 'VCLinkerTool': { 46 'VCLinkerTool': {
47 'AdditionalDependencies': [ 47 'AdditionalDependencies': [
48 'crypt32.lib', 48 'crypt32.lib',
49 ], 49 ],
50 }, 50 },
51 }, 51 },
52 }], 52 }],
53 ['OS=="linux" and chromeos!=1 and use_glib==1', { 53 ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus==1)', {
54 'sources': [ 54 'sources': [
55 'os_crypt/key_storage_libsecret.cc',
56 'os_crypt/key_storage_libsecret.h',
57 'os_crypt/key_storage_linux.cc', 55 'os_crypt/key_storage_linux.cc',
58 'os_crypt/key_storage_linux.h', 56 'os_crypt/key_storage_linux.h',
59 'os_crypt/libsecret_util_linux.cc',
60 'os_crypt/libsecret_util_linux.h',
61 'os_crypt/os_crypt_linux.cc', 57 'os_crypt/os_crypt_linux.cc',
62 ], 58 ],
63 'sources!': [ 59 'sources!': [
64 'os_crypt/os_crypt_posix.cc', 60 'os_crypt/os_crypt_posix.cc',
65 ], 61 ],
66 'defines': [ 62 'conditions': [
67 'USE_LIBSECRET', 63 ['use_glib==1', {
68 ], 64 'sources': [
69 'include_dirs' : [ 65 'os_crypt/key_storage_libsecret.cc',
70 '../third_party/libsecret/' 66 'os_crypt/key_storage_libsecret.h',
71 ], 67 'os_crypt/libsecret_util_linux.cc',
72 'dependencies': [ 68 'os_crypt/libsecret_util_linux.h',
73 '../build/linux/system.gyp:glib', 69 ],
70 'defines': [
71 'USE_LIBSECRET',
72 ],
73 'include_dirs' : [
74 '../third_party/libsecret/'
75 ],
76 'dependencies': [
77 '../build/linux/system.gyp:glib',
78 ],
79 }],
80 ['use_dbus==1', {
81 'sources': [
82 'os_crypt/kwallet_dbus.cc',
83 'os_crypt/kwallet_dbus.h',
84 ],
85 'defines': [
86 'USE_KWALLET',
87 ],
88 'dependencies': [
89 '../build/linux/system.gyp:dbus',
90 '../dbus/dbus.gyp:dbus',
91 ],
92 'include_dirs': [
93 '..',
94 ],
95 }]
74 ], 96 ],
75 }], 97 }],
76 ], 98 ],
77 'target_conditions': [ 99 'target_conditions': [
78 ['OS=="ios"', { 100 ['OS=="ios"', {
79 'sources/': [ 101 'sources/': [
80 ['include', '^os_crypt/keychain_password_mac\\.mm$'], 102 ['include', '^os_crypt/keychain_password_mac\\.mm$'],
81 ['include', '^os_crypt/os_crypt_mac\\.mm$'], 103 ['include', '^os_crypt/os_crypt_mac\\.mm$'],
82 ], 104 ],
83 }], 105 }],
84 ], 106 ],
85 }, 107 },
86 { 108 {
87 'target_name': 'os_crypt_test_support', 109 'target_name': 'os_crypt_test_support',
88 'type': 'static_library', 110 'type': 'static_library',
89 'sources': [ 111 'sources': [
90 'os_crypt/os_crypt_mocker.cc', 112 'os_crypt/os_crypt_mocker.cc',
91 'os_crypt/os_crypt_mocker.h', 113 'os_crypt/os_crypt_mocker.h',
92 ], 114 ],
93 'dependencies': [ 115 'dependencies': [
94 '../base/base.gyp:base', 116 '../base/base.gyp:base',
95 '../testing/gtest.gyp:gtest', 117 '../testing/gtest.gyp:gtest',
96 ], 118 ],
97 'conditions': [ 119 'conditions': [
98 ['OS=="linux" and chromeos!=1 and use_glib==1', { 120 ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus)', {
99 'sources': [ 121 'sources': [
100 'os_crypt/os_crypt_mocker_linux.cc', 122 'os_crypt/os_crypt_mocker_linux.cc',
101 'os_crypt/os_crypt_mocker_linux.h', 123 'os_crypt/os_crypt_mocker_linux.h',
102 ], 124 ],
103 'defines': [ 125 'defines': [
104 'USE_LIBSECRET', 126 'USE_LIBSECRET',
105 ], 127 ],
106 'include_dirs' : [ 128 'include_dirs' : [
107 '../third_party/libsecret/' 129 '../third_party/libsecret/'
108 ], 130 ],
109 'dependencies': [ 131 'dependencies': [
110 '../build/linux/system.gyp:glib', 132 '../build/linux/system.gyp:glib',
111 ], 133 ],
112 }], 134 }],
113 ] 135 ]
114 } 136 }
115 ], 137 ],
116 } 138 }
OLDNEW
« 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