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

Side by Side Diff: components/components_tests.gyp

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 | « chrome/browser/chrome_browser_main_linux.cc ('k') | components/os_crypt.gypi » ('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 'variables': { 6 'variables': {
7 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1588 '../device/media_transfer_protocol/media_transfer_protocol.gyp:devic e_media_transfer_protocol', 1588 '../device/media_transfer_protocol/media_transfer_protocol.gyp:devic e_media_transfer_protocol',
1589 ], 1589 ],
1590 }], 1590 }],
1591 ['OS=="linux" and chromeos!=1', { 1591 ['OS=="linux" and chromeos!=1', {
1592 'sources': [ 1592 'sources': [
1593 'os_crypt/kwallet_dbus_unittest.cc', 1593 'os_crypt/kwallet_dbus_unittest.cc',
1594 'os_crypt/os_crypt_linux_unittest.cc', 1594 'os_crypt/os_crypt_linux_unittest.cc',
1595 'os_crypt/os_crypt_util_linux_unittest.cc', 1595 'os_crypt/os_crypt_util_linux_unittest.cc',
1596 ], 1596 ],
1597 'defines': [ 1597 'defines': [
1598 'USE_KWALLET',
1599 'USE_LIBSECRET', 1598 'USE_LIBSECRET',
1600 ], 1599 ],
1601 'include_dirs': [ 1600 'include_dirs': [
1602 '../third_party/libsecret' 1601 '../third_party/libsecret'
1603 ], 1602 ],
1604 'dependencies' : [ 1603 'dependencies' : [
1605 '../build/linux/system.gyp:dbus', 1604 '../build/linux/system.gyp:dbus',
1606 '../dbus/dbus.gyp:dbus', 1605 '../dbus/dbus.gyp:dbus',
1607 '../dbus/dbus.gyp:dbus_test_support', 1606 '../dbus/dbus.gyp:dbus_test_support',
1608 ] 1607 ]
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 'dependencies': [ 2030 'dependencies': [
2032 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2031 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2033 ], 2032 ],
2034 }], 2033 }],
2035 ], 2034 ],
2036 }, 2035 },
2037 ], 2036 ],
2038 }], 2037 }],
2039 ], 2038 ],
2040 } 2039 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.cc ('k') | components/os_crypt.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698