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

Side by Side Diff: components/os_crypt.gypi

Issue 2152493002: Revert of Forward password-store switch to OSCrypt component (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/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', { 53 ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus==1)', {
54 'sources': [ 54 'sources': [
55 'os_crypt/key_storage_linux.cc', 55 'os_crypt/key_storage_linux.cc',
56 'os_crypt/key_storage_linux.h', 56 'os_crypt/key_storage_linux.h',
57 'os_crypt/os_crypt_linux.cc', 57 'os_crypt/os_crypt_linux.cc',
58 ], 58 ],
59 'sources!': [ 59 'sources!': [
60 'os_crypt/os_crypt_posix.cc', 60 'os_crypt/os_crypt_posix.cc',
61 ], 61 ],
62 'conditions': [ 62 'conditions': [
63 ['use_glib==1', { 63 ['use_glib==1', {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 'type': 'static_library', 110 'type': 'static_library',
111 'sources': [ 111 'sources': [
112 'os_crypt/os_crypt_mocker.cc', 112 'os_crypt/os_crypt_mocker.cc',
113 'os_crypt/os_crypt_mocker.h', 113 'os_crypt/os_crypt_mocker.h',
114 ], 114 ],
115 'dependencies': [ 115 'dependencies': [
116 '../base/base.gyp:base', 116 '../base/base.gyp:base',
117 '../testing/gtest.gyp:gtest', 117 '../testing/gtest.gyp:gtest',
118 ], 118 ],
119 'conditions': [ 119 'conditions': [
120 ['OS=="linux" and chromeos!=1', { 120 ['OS=="linux" and chromeos!=1 and (use_glib==1 or use_dbus)', {
121 'sources': [ 121 'sources': [
122 'os_crypt/os_crypt_mocker_linux.cc', 122 'os_crypt/os_crypt_mocker_linux.cc',
123 'os_crypt/os_crypt_mocker_linux.h', 123 'os_crypt/os_crypt_mocker_linux.h',
124 ], 124 ],
125 'defines': [ 125 'defines': [
126 'USE_LIBSECRET', 126 'USE_LIBSECRET',
127 ], 127 ],
128 'include_dirs' : [ 128 'include_dirs' : [
129 '../third_party/libsecret/' 129 '../third_party/libsecret/'
130 ], 130 ],
131 'dependencies': [ 131 'dependencies': [
132 '../build/linux/system.gyp:glib', 132 '../build/linux/system.gyp:glib',
133 ], 133 ],
134 }], 134 }],
135 ] 135 ]
136 } 136 }
137 ], 137 ],
138 } 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