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

Side by Side Diff: chrome/chrome_tests.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_common.gypi ('k') | chrome/chrome_tests_unit.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'build_angle_deqp_tests%': 0, 6 'build_angle_deqp_tests%': 0,
7 'chrome_browser_extensions_test_support_sources': [ 7 'chrome_browser_extensions_test_support_sources': [
8 # A list of sources which is shared between different browser tests. 8 # A list of sources which is shared between different browser tests.
9 'browser/apps/app_browsertest_util.cc', 9 'browser/apps/app_browsertest_util.cc',
10 'browser/apps/app_browsertest_util.h', 10 'browser/apps/app_browsertest_util.h',
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
1696 ], 1696 ],
1697 'conditions': [ 1697 'conditions': [
1698 ['use_x11==1', { 1698 ['use_x11==1', {
1699 'dependencies': [ 1699 'dependencies': [
1700 '../build/linux/system.gyp:xtst', 1700 '../build/linux/system.gyp:xtst',
1701 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1701 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1702 ], 1702 ],
1703 }], 1703 }],
1704 ['OS=="linux"', { 1704 ['OS=="linux"', {
1705 'dependencies': [ 1705 'dependencies': [
1706 '../build/linux/system.gyp:ssl', 1706 '../build/linux/system.gyp:nss',
1707 ], 1707 ],
1708 }, { # Non-Linux platforms (Linux includes ChromeOS here). 1708 }, { # Non-Linux platforms (Linux includes ChromeOS here).
1709 'sources': [ 1709 'sources': [
1710 '<@(chrome_interactive_ui_test_non_linux_and_chromeos_sources)', 1710 '<@(chrome_interactive_ui_test_non_linux_and_chromeos_sources)',
1711 ], 1711 ],
1712 }], 1712 }],
1713 ['OS=="linux" and chromeos==0', { 1713 ['OS=="linux" and chromeos==0', {
1714 'sources!': [ 1714 'sources!': [
1715 # TODO(port): This times out. Attempts have been made to fix the 1715 # TODO(port): This times out. Attempts have been made to fix the
1716 # individual failures, but each time I disable a test from these 1716 # individual failures, but each time I disable a test from these
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
2516 'browser/ui/ash/accelerator_commands_browsertest.cc', 2516 'browser/ui/ash/accelerator_commands_browsertest.cc',
2517 'browser/ui/ash/accelerator_controller_browsertest.cc', 2517 'browser/ui/ash/accelerator_controller_browsertest.cc',
2518 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', 2518 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
2519 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', 2519 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
2520 'browser/ui/ash/shelf_browsertest.cc', 2520 'browser/ui/ash/shelf_browsertest.cc',
2521 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes t.cc', 2521 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes t.cc',
2522 ], 2522 ],
2523 }], 2523 }],
2524 ['OS=="linux"', { 2524 ['OS=="linux"', {
2525 'dependencies': [ 2525 'dependencies': [
2526 '../build/linux/system.gyp:ssl', 2526 '../build/linux/system.gyp:nss',
2527 ], 2527 ],
2528 }], 2528 }],
2529 ['OS=="mac"', { 2529 ['OS=="mac"', {
2530 # TODO(mark): We really want this for all non-static library 2530 # TODO(mark): We really want this for all non-static library
2531 # targets, but when we tried to pull it up to the common.gypi 2531 # targets, but when we tried to pull it up to the common.gypi
2532 # level, it broke other things like the ui and startup tests. *shrug* 2532 # level, it broke other things like the ui and startup tests. *shrug*
2533 'xcode_settings': { 2533 'xcode_settings': {
2534 'OTHER_LDFLAGS': [ 2534 'OTHER_LDFLAGS': [
2535 '-Wl,-ObjC', 2535 '-Wl,-ObjC',
2536 ], 2536 ],
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
2837 'app/chrome_version.rc.version', 2837 'app/chrome_version.rc.version',
2838 ], 2838 ],
2839 }], 2839 }],
2840 ['use_x11==1', { 2840 ['use_x11==1', {
2841 'dependencies': [ 2841 'dependencies': [
2842 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2842 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2843 ], 2843 ],
2844 }], 2844 }],
2845 ['OS=="linux"', { 2845 ['OS=="linux"', {
2846 'dependencies': [ 2846 'dependencies': [
2847 '../build/linux/system.gyp:ssl', 2847 '../build/linux/system.gyp:nss',
2848 ], 2848 ],
2849 }], 2849 }],
2850 ['OS=="mac"', { 2850 ['OS=="mac"', {
2851 # TODO(mark): We really want this for all non-static library 2851 # TODO(mark): We really want this for all non-static library
2852 # targets, but when we tried to pull it up to the common.gypi 2852 # targets, but when we tried to pull it up to the common.gypi
2853 # level, it broke other things like the ui and startup tests. *shrug* 2853 # level, it broke other things like the ui and startup tests. *shrug*
2854 'xcode_settings': { 2854 'xcode_settings': {
2855 'OTHER_LDFLAGS': [ 2855 'OTHER_LDFLAGS': [
2856 '-Wl,-ObjC', 2856 '-Wl,-ObjC',
2857 ], 2857 ],
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
2970 # TODO(phajdan.jr): Only temporary, to make transition easier. 2970 # TODO(phajdan.jr): Only temporary, to make transition easier.
2971 'defines': [ 2971 'defines': [
2972 'HAS_OUT_OF_PROC_TEST_RUNNER', 2972 'HAS_OUT_OF_PROC_TEST_RUNNER',
2973 ], 2973 ],
2974 'sources': [ 2974 'sources': [
2975 '<@(sync_integration_tests_sources)', 2975 '<@(sync_integration_tests_sources)',
2976 ], 2976 ],
2977 'conditions': [ 2977 'conditions': [
2978 ['OS=="linux"', { 2978 ['OS=="linux"', {
2979 'dependencies': [ 2979 'dependencies': [
2980 '../build/linux/system.gyp:ssl', 2980 '../build/linux/system.gyp:nss',
2981 ], 2981 ],
2982 }], 2982 }],
2983 ['OS=="mac"', { 2983 ['OS=="mac"', {
2984 # The sync_integration_tests do not run on mac without this flag. 2984 # The sync_integration_tests do not run on mac without this flag.
2985 # Search for comments about "xcode_settings" elsewhere in this file. 2985 # Search for comments about "xcode_settings" elsewhere in this file.
2986 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2986 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2987 # Dictionary sync is disabled on Mac. 2987 # Dictionary sync is disabled on Mac.
2988 # Note: list duplicated in GN build. 2988 # Note: list duplicated in GN build.
2989 'sources!': [ 2989 'sources!': [
2990 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2990 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
3070 ], 3070 ],
3071 'defines': [ 3071 'defines': [
3072 'HAS_OUT_OF_PROC_TEST_RUNNER', 3072 'HAS_OUT_OF_PROC_TEST_RUNNER',
3073 ], 3073 ],
3074 'sources': [ 3074 'sources': [
3075 '<@(sync_performance_tests_sources)', 3075 '<@(sync_performance_tests_sources)',
3076 ], 3076 ],
3077 'conditions': [ 3077 'conditions': [
3078 ['OS=="linux"', { 3078 ['OS=="linux"', {
3079 'dependencies': [ 3079 'dependencies': [
3080 '../build/linux/system.gyp:ssl', 3080 '../build/linux/system.gyp:nss',
3081 ], 3081 ],
3082 }], 3082 }],
3083 ['OS=="mac"', { 3083 ['OS=="mac"', {
3084 # The sync_performance_tests do not run on mac without this flag. 3084 # The sync_performance_tests do not run on mac without this flag.
3085 # Search for comments about "xcode_settings" elsewhere in this file. 3085 # Search for comments about "xcode_settings" elsewhere in this file.
3086 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3086 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3087 # Dictionary sync is disabled on Mac. 3087 # Dictionary sync is disabled on Mac.
3088 'sources!': [ 3088 'sources!': [
3089 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc', 3089 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc',
3090 ], 3090 ],
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
3592 'browser', 3592 'browser',
3593 ], 3593 ],
3594 'sources': [ 3594 'sources': [
3595 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3595 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3596 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3596 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3597 ], 3597 ],
3598 }] 3598 }]
3599 }], 3599 }],
3600 ], # 'conditions' 3600 ], # 'conditions'
3601 } 3601 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698