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

Side by Side Diff: trunk/src/chrome/chrome_tests.gypi

Issue 297753002: Revert 271721 "VS2013 Update 2" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/chrome/chrome_dll.gypi ('k') | trunk/src/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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 'browser/ui/panels/docked_panel_browsertest.cc', 300 'browser/ui/panels/docked_panel_browsertest.cc',
301 'browser/ui/panels/panel_browsertest.cc', 301 'browser/ui/panels/panel_browsertest.cc',
302 'browser/ui/panels/panel_drag_browsertest.cc', 302 'browser/ui/panels/panel_drag_browsertest.cc',
303 'browser/ui/panels/panel_resize_browsertest.cc', 303 'browser/ui/panels/panel_resize_browsertest.cc',
304 'browser/ui/panels/stacked_panel_browsertest.cc', 304 'browser/ui/panels/stacked_panel_browsertest.cc',
305 'browser/ui/views/message_center/web_notification_tray_browsertest.c c', 305 'browser/ui/views/message_center/web_notification_tray_browsertest.c c',
306 'browser/ui/views/panels/panel_view_browsertest.cc', 306 'browser/ui/views/panels/panel_view_browsertest.cc',
307 ], 307 ],
308 }], 308 }],
309 ['OS=="win"', { 309 ['OS=="win"', {
310 'msvs_large_pdb': 1,
310 'include_dirs': [ 311 'include_dirs': [
311 '../third_party/wtl/include', 312 '../third_party/wtl/include',
312 ], 313 ],
313 'dependencies': [ 314 'dependencies': [
314 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 315 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
315 '../ui/resources/ui_resources.gyp:ui_resources', 316 '../ui/resources/ui_resources.gyp:ui_resources',
316 'chrome.gyp:chrome_version_resources', 317 'chrome.gyp:chrome_version_resources',
317 ], 318 ],
318 'sources': [ 319 'sources': [
319 '../ui/resources/cursors/aliasb.cur', 320 '../ui/resources/cursors/aliasb.cur',
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1781 }], 1782 }],
1782 ['OS=="win"', { 1783 ['OS=="win"', {
1783 'sources': [ 1784 'sources': [
1784 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1785 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1785 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1786 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
1786 ], 1787 ],
1787 'include_dirs': [ 1788 'include_dirs': [
1788 '<(DEPTH)/third_party/wtl/include', 1789 '<(DEPTH)/third_party/wtl/include',
1789 ], 1790 ],
1790 'dependencies': [ 1791 'dependencies': [
1792 'browser_tests_exe_pdb_workaround',
1791 'chrome_version_resources', 1793 'chrome_version_resources',
1792 'security_tests', # run time dependency 1794 'security_tests', # run time dependency
1793 ], 1795 ],
1794 'conditions': [ 1796 'conditions': [
1795 ['win_use_allocator_shim==1', { 1797 ['win_use_allocator_shim==1', {
1796 'dependencies': [ 1798 'dependencies': [
1797 '<(allocator_target)', 1799 '<(allocator_target)',
1798 ], 1800 ],
1799 }], 1801 }],
1800 ], 1802 ],
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
2099 'sources': [ 2101 'sources': [
2100 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2102 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2101 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2103 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2102 ], 2104 ],
2103 'include_dirs': [ 2105 'include_dirs': [
2104 '<(DEPTH)/third_party/wtl/include', 2106 '<(DEPTH)/third_party/wtl/include',
2105 ], 2107 ],
2106 'dependencies': [ 2108 'dependencies': [
2107 'chrome_version_resources', 2109 'chrome_version_resources',
2108 ], 2110 ],
2111 'msvs_large_pdb': 1,
2109 'conditions': [ 2112 'conditions': [
2110 ['win_use_allocator_shim==1', { 2113 ['win_use_allocator_shim==1', {
2111 'dependencies': [ 2114 'dependencies': [
2112 '<(allocator_target)', 2115 '<(allocator_target)',
2113 ], 2116 ],
2114 }], 2117 }],
2115 ], 2118 ],
2116 'configurations': { 2119 'configurations': {
2117 'Debug_Base': { 2120 'Debug_Base': {
2118 'msvs_settings': { 2121 'msvs_settings': {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
2373 # Search for comments about "xcode_settings" elsewhere in this file. 2376 # Search for comments about "xcode_settings" elsewhere in this file.
2374 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2377 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2375 # Dictionary sync is disabled on Mac. 2378 # Dictionary sync is disabled on Mac.
2376 'sources!': [ 2379 'sources!': [
2377 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc', 2380 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2378 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2381 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2379 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', 2382 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2380 ], 2383 ],
2381 }], 2384 }],
2382 ['OS=="win"', { 2385 ['OS=="win"', {
2386 'msvs_large_pdb': 1,
2383 'sources': [ 2387 'sources': [
2384 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2388 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2385 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2389 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2386 ], 2390 ],
2387 'include_dirs': [ 2391 'include_dirs': [
2388 '<(DEPTH)/third_party/wtl/include', 2392 '<(DEPTH)/third_party/wtl/include',
2389 ], 2393 ],
2390 'dependencies': [ 2394 'dependencies': [
2391 'chrome_version_resources', 2395 'chrome_version_resources',
2392 ], 2396 ],
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
2478 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2482 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2479 # Dictionary sync is disabled on Mac. 2483 # Dictionary sync is disabled on Mac.
2480 'sources!': [ 2484 'sources!': [
2481 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc', 2485 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc',
2482 ], 2486 ],
2483 }], 2487 }],
2484 ['OS=="win"', { 2488 ['OS=="win"', {
2485 'sources': [ 2489 'sources': [
2486 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2490 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2487 ], 2491 ],
2492 'msvs_large_pdb': 1,
2488 'include_dirs': [ 2493 'include_dirs': [
2489 '<(DEPTH)/third_party/wtl/include', 2494 '<(DEPTH)/third_party/wtl/include',
2490 ], 2495 ],
2491 'dependencies': [ 2496 'dependencies': [
2492 'chrome_version_resources', 2497 'chrome_version_resources',
2493 ], 2498 ],
2494 'conditions': [ 2499 'conditions': [
2495 ['win_use_allocator_shim==1', { 2500 ['win_use_allocator_shim==1', {
2496 'dependencies': [ 2501 'dependencies': [
2497 '<(allocator_target)', 2502 '<(allocator_target)',
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2932 'includes': [ 2937 'includes': [
2933 '../build/isolate.gypi', 2938 '../build/isolate.gypi',
2934 'telemetry_gpu_test.isolate', 2939 'telemetry_gpu_test.isolate',
2935 ], 2940 ],
2936 'sources': [ 2941 'sources': [
2937 'telemetry_gpu_test.isolate', 2942 'telemetry_gpu_test.isolate',
2938 ], 2943 ],
2939 }, 2944 },
2940 ], 2945 ],
2941 }], 2946 }],
2947 ['OS=="win"', {
2948 'targets' : [
2949 {
2950 # This target is only depended upon in Windows.
2951 'target_name': 'browser_tests_exe_pdb_workaround',
2952 'type': 'static_library',
2953 'sources': [ 'empty_pdb_workaround.cc' ],
2954 'msvs_settings': {
2955 'VCCLCompilerTool': {
2956 # This *in the compile phase* must match the pdb name that's
2957 # output by the final link. See empty_pdb_workaround.cc for
2958 # more details.
2959 'DebugInformationFormat': '3',
2960 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
2961 },
2962 },
2963 },
2964 ],
2965 }],
2942 [ 'enable_mdns == 1', { 2966 [ 'enable_mdns == 1', {
2943 'targets': [{ 2967 'targets': [{
2944 'target_name': 'service_discovery_sniffer', 2968 'target_name': 'service_discovery_sniffer',
2945 'type': 'executable', 2969 'type': 'executable',
2946 'dependencies': [ 2970 'dependencies': [
2947 '../net/net.gyp:net', 2971 '../net/net.gyp:net',
2948 '../base/base.gyp:base', 2972 '../base/base.gyp:base',
2949 '../base/base.gyp:test_support_base', 2973 '../base/base.gyp:test_support_base',
2950 'utility', 2974 'utility',
2951 ], 2975 ],
2952 'sources': [ 2976 'sources': [
2953 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 2977 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
2954 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 2978 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
2955 ], 2979 ],
2956 'conditions': [ 2980 'conditions': [
2957 ['enable_webrtc==1', { 2981 ['enable_webrtc==1', {
2958 'dependencies': [ 2982 'dependencies': [
2959 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2983 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2960 ] 2984 ]
2961 }], 2985 }],
2962 ], 2986 ],
2963 }] 2987 }]
2964 }], 2988 }],
2965 ], # 'conditions' 2989 ], # 'conditions'
2966 } 2990 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_dll.gypi ('k') | trunk/src/chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698