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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 284663003: VS2013 Update 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings on .hash file Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_dll.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 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 'browser/ui/panels/docked_panel_browsertest.cc', 296 'browser/ui/panels/docked_panel_browsertest.cc',
297 'browser/ui/panels/panel_browsertest.cc', 297 'browser/ui/panels/panel_browsertest.cc',
298 'browser/ui/panels/panel_drag_browsertest.cc', 298 'browser/ui/panels/panel_drag_browsertest.cc',
299 'browser/ui/panels/panel_resize_browsertest.cc', 299 'browser/ui/panels/panel_resize_browsertest.cc',
300 'browser/ui/panels/stacked_panel_browsertest.cc', 300 'browser/ui/panels/stacked_panel_browsertest.cc',
301 'browser/ui/views/message_center/web_notification_tray_browsertest.c c', 301 'browser/ui/views/message_center/web_notification_tray_browsertest.c c',
302 'browser/ui/views/panels/panel_view_browsertest.cc', 302 'browser/ui/views/panels/panel_view_browsertest.cc',
303 ], 303 ],
304 }], 304 }],
305 ['OS=="win"', { 305 ['OS=="win"', {
306 'msvs_large_pdb': 1,
307 'include_dirs': [ 306 'include_dirs': [
308 '../third_party/wtl/include', 307 '../third_party/wtl/include',
309 ], 308 ],
310 'dependencies': [ 309 'dependencies': [
311 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 310 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
312 '../ui/resources/ui_resources.gyp:ui_resources', 311 '../ui/resources/ui_resources.gyp:ui_resources',
313 'chrome.gyp:chrome_version_resources', 312 'chrome.gyp:chrome_version_resources',
314 ], 313 ],
315 'sources': [ 314 'sources': [
316 '../ui/resources/cursors/aliasb.cur', 315 '../ui/resources/cursors/aliasb.cur',
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 }], 1766 }],
1768 ['OS=="win"', { 1767 ['OS=="win"', {
1769 'sources': [ 1768 'sources': [
1770 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1769 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1771 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1770 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
1772 ], 1771 ],
1773 'include_dirs': [ 1772 'include_dirs': [
1774 '<(DEPTH)/third_party/wtl/include', 1773 '<(DEPTH)/third_party/wtl/include',
1775 ], 1774 ],
1776 'dependencies': [ 1775 'dependencies': [
1777 'browser_tests_exe_pdb_workaround',
1778 'chrome_version_resources', 1776 'chrome_version_resources',
1779 'security_tests', # run time dependency 1777 'security_tests', # run time dependency
1780 ], 1778 ],
1781 'conditions': [ 1779 'conditions': [
1782 ['win_use_allocator_shim==1', { 1780 ['win_use_allocator_shim==1', {
1783 'dependencies': [ 1781 'dependencies': [
1784 '<(allocator_target)', 1782 '<(allocator_target)',
1785 ], 1783 ],
1786 }], 1784 }],
1787 ], 1785 ],
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2083 'sources': [ 2081 'sources': [
2084 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2082 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2085 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2083 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2086 ], 2084 ],
2087 'include_dirs': [ 2085 'include_dirs': [
2088 '<(DEPTH)/third_party/wtl/include', 2086 '<(DEPTH)/third_party/wtl/include',
2089 ], 2087 ],
2090 'dependencies': [ 2088 'dependencies': [
2091 'chrome_version_resources', 2089 'chrome_version_resources',
2092 ], 2090 ],
2093 'msvs_large_pdb': 1,
2094 'conditions': [ 2091 'conditions': [
2095 ['win_use_allocator_shim==1', { 2092 ['win_use_allocator_shim==1', {
2096 'dependencies': [ 2093 'dependencies': [
2097 '<(allocator_target)', 2094 '<(allocator_target)',
2098 ], 2095 ],
2099 }], 2096 }],
2100 ], 2097 ],
2101 'configurations': { 2098 'configurations': {
2102 'Debug_Base': { 2099 'Debug_Base': {
2103 'msvs_settings': { 2100 'msvs_settings': {
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
2356 # Search for comments about "xcode_settings" elsewhere in this file. 2353 # Search for comments about "xcode_settings" elsewhere in this file.
2357 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2354 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2358 # Dictionary sync is disabled on Mac. 2355 # Dictionary sync is disabled on Mac.
2359 'sources!': [ 2356 'sources!': [
2360 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc', 2357 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2361 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2358 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2362 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', 2359 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2363 ], 2360 ],
2364 }], 2361 }],
2365 ['OS=="win"', { 2362 ['OS=="win"', {
2366 'msvs_large_pdb': 1,
2367 'sources': [ 2363 'sources': [
2368 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2364 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2369 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2365 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2370 ], 2366 ],
2371 'include_dirs': [ 2367 'include_dirs': [
2372 '<(DEPTH)/third_party/wtl/include', 2368 '<(DEPTH)/third_party/wtl/include',
2373 ], 2369 ],
2374 'dependencies': [ 2370 'dependencies': [
2375 'chrome_version_resources', 2371 'chrome_version_resources',
2376 ], 2372 ],
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2458 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2463 # Dictionary sync is disabled on Mac. 2459 # Dictionary sync is disabled on Mac.
2464 'sources!': [ 2460 'sources!': [
2465 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc', 2461 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc',
2466 ], 2462 ],
2467 }], 2463 }],
2468 ['OS=="win"', { 2464 ['OS=="win"', {
2469 'sources': [ 2465 'sources': [
2470 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2466 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2471 ], 2467 ],
2472 'msvs_large_pdb': 1,
2473 'include_dirs': [ 2468 'include_dirs': [
2474 '<(DEPTH)/third_party/wtl/include', 2469 '<(DEPTH)/third_party/wtl/include',
2475 ], 2470 ],
2476 'dependencies': [ 2471 'dependencies': [
2477 'chrome_version_resources', 2472 'chrome_version_resources',
2478 ], 2473 ],
2479 'conditions': [ 2474 'conditions': [
2480 ['win_use_allocator_shim==1', { 2475 ['win_use_allocator_shim==1', {
2481 'dependencies': [ 2476 'dependencies': [
2482 '<(allocator_target)', 2477 '<(allocator_target)',
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
2903 'includes': [ 2898 'includes': [
2904 '../build/isolate.gypi', 2899 '../build/isolate.gypi',
2905 'telemetry_gpu_test.isolate', 2900 'telemetry_gpu_test.isolate',
2906 ], 2901 ],
2907 'sources': [ 2902 'sources': [
2908 'telemetry_gpu_test.isolate', 2903 'telemetry_gpu_test.isolate',
2909 ], 2904 ],
2910 }, 2905 },
2911 ], 2906 ],
2912 }], 2907 }],
2913 ['OS=="win"', {
2914 'targets' : [
2915 {
2916 # This target is only depended upon in Windows.
2917 'target_name': 'browser_tests_exe_pdb_workaround',
2918 'type': 'static_library',
2919 'sources': [ 'empty_pdb_workaround.cc' ],
2920 'msvs_settings': {
2921 'VCCLCompilerTool': {
2922 # This *in the compile phase* must match the pdb name that's
2923 # output by the final link. See empty_pdb_workaround.cc for
2924 # more details.
2925 'DebugInformationFormat': '3',
2926 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
2927 },
2928 },
2929 },
2930 ],
2931 }],
2932 [ 'enable_mdns == 1', { 2908 [ 'enable_mdns == 1', {
2933 'targets': [{ 2909 'targets': [{
2934 'target_name': 'service_discovery_sniffer', 2910 'target_name': 'service_discovery_sniffer',
2935 'type': 'executable', 2911 'type': 'executable',
2936 'dependencies': [ 2912 'dependencies': [
2937 '../net/net.gyp:net', 2913 '../net/net.gyp:net',
2938 '../base/base.gyp:base', 2914 '../base/base.gyp:base',
2939 '../base/base.gyp:test_support_base', 2915 '../base/base.gyp:test_support_base',
2940 'utility', 2916 'utility',
2941 ], 2917 ],
2942 'sources': [ 2918 'sources': [
2943 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 2919 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
2944 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 2920 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
2945 ], 2921 ],
2946 'conditions': [ 2922 'conditions': [
2947 ['enable_webrtc==1', { 2923 ['enable_webrtc==1', {
2948 'dependencies': [ 2924 'dependencies': [
2949 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2925 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2950 ] 2926 ]
2951 }], 2927 }],
2952 ], 2928 ],
2953 }] 2929 }]
2954 }], 2930 }],
2955 ], # 'conditions' 2931 ], # 'conditions'
2956 } 2932 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698