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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1918303002: Renaming system.gyp:ssl to system.gyp:nss and removing unused BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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/chrome_tests.gypi ('k') | chromeos/chromeos.gyp » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after
2030 ], 2030 ],
2031 }], 2031 }],
2032 ['safe_browsing==1', { 2032 ['safe_browsing==1', {
2033 'sources': [ 2033 'sources': [
2034 'browser/extensions/fake_safe_browsing_database_manager.cc', 2034 'browser/extensions/fake_safe_browsing_database_manager.cc',
2035 'browser/extensions/fake_safe_browsing_database_manager.h', 2035 'browser/extensions/fake_safe_browsing_database_manager.h',
2036 ], 2036 ],
2037 }], 2037 }],
2038 ['OS=="linux"', { 2038 ['OS=="linux"', {
2039 'dependencies': [ 2039 'dependencies': [
2040 '../build/linux/system.gyp:ssl', 2040 '../build/linux/system.gyp:nss',
2041 ], 2041 ],
2042 }], 2042 }],
2043 ['enable_print_preview==1', { 2043 ['enable_print_preview==1', {
2044 'dependencies': [ 2044 'dependencies': [
2045 'service', 2045 'service',
2046 ], 2046 ],
2047 }], 2047 }],
2048 ['enable_extensions==1', { 2048 ['enable_extensions==1', {
2049 'dependencies': [ 2049 'dependencies': [
2050 '../components/components.gyp:drive_test_support', 2050 '../components/components.gyp:drive_test_support',
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
2535 ], 2535 ],
2536 }], 2536 }],
2537 ['use_x11==1', { 2537 ['use_x11==1', {
2538 'dependencies': [ 2538 'dependencies': [
2539 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2539 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2540 '../ui/events/devices/events_devices.gyp:events_devices', 2540 '../ui/events/devices/events_devices.gyp:events_devices',
2541 ], 2541 ],
2542 }], 2542 }],
2543 ['OS=="linux"', { 2543 ['OS=="linux"', {
2544 'dependencies': [ 2544 'dependencies': [
2545 '../build/linux/system.gyp:ssl', 2545 '../build/linux/system.gyp:nss',
2546 ], 2546 ],
2547 }], 2547 }],
2548 # Only add this test for 64 bit builds because otherwise we need the 32 2548 # Only add this test for 64 bit builds because otherwise we need the 32
2549 # bit library on 64 bit systems when running this test. 2549 # bit library on 64 bit systems when running this test.
2550 ['use_gnome_keyring == 1 and target_arch=="x64"', { 2550 ['use_gnome_keyring == 1 and target_arch=="x64"', {
2551 'sources': [ 2551 'sources': [
2552 'browser/password_manager/native_backend_gnome_x_unittest.cc', 2552 'browser/password_manager/native_backend_gnome_x_unittest.cc',
2553 ], 2553 ],
2554 # We use a few library functions directly, so link directly. 2554 # We use a few library functions directly, so link directly.
2555 'dependencies': [ 2555 'dependencies': [
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
3006 'dependencies': [ 3006 'dependencies': [
3007 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3007 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3008 ], 3008 ],
3009 }], 3009 }],
3010 ], 3010 ],
3011 }, 3011 },
3012 ], 3012 ],
3013 }], 3013 }],
3014 ], # 'conditions' 3014 ], # 'conditions'
3015 } 3015 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698