| OLD | NEW | 
|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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     'pyautolib_sources': [ | 7     'pyautolib_sources': [ | 
| 8       'app/chrome_command_ids.h', | 8       'app/chrome_command_ids.h', | 
| 9       'app/chrome_dll_resource.h', | 9       'app/chrome_dll_resource.h', | 
| 10       'common/automation_constants.h', | 10       'common/automation_constants.h', | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 24       'type': '<(library)', | 24       'type': '<(library)', | 
| 25       'dependencies': [ | 25       'dependencies': [ | 
| 26         'browser', | 26         'browser', | 
| 27         'common', | 27         'common', | 
| 28         'renderer', | 28         'renderer', | 
| 29         'chrome_resources', | 29         'chrome_resources', | 
| 30         'chrome_strings', | 30         'chrome_strings', | 
| 31         'app/policy/cloud_policy_codegen.gyp:policy', | 31         'app/policy/cloud_policy_codegen.gyp:policy', | 
| 32         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', | 32         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', | 
| 33         'theme_resources', | 33         'theme_resources', | 
|  | 34         'theme_resources_standard', | 
| 34         '../base/base.gyp:test_support_base', | 35         '../base/base.gyp:test_support_base', | 
| 35         '../content/content.gyp:content_gpu', | 36         '../content/content.gyp:content_gpu', | 
| 36         '../ipc/ipc.gyp:test_support_ipc', | 37         '../ipc/ipc.gyp:test_support_ipc', | 
| 37         '../media/media.gyp:media_test_support', | 38         '../media/media.gyp:media_test_support', | 
| 38         # 'test/test_url_request_context_getter.h' brings in this requirement. | 39         # 'test/test_url_request_context_getter.h' brings in this requirement. | 
| 39         '../net/net.gyp:net_test_support', | 40         '../net/net.gyp:net_test_support', | 
| 40         '../skia/skia.gyp:skia', | 41         '../skia/skia.gyp:skia', | 
| 41         '../testing/gmock.gyp:gmock', | 42         '../testing/gmock.gyp:gmock', | 
| 42         '../testing/gtest.gyp:gtest', | 43         '../testing/gtest.gyp:gtest', | 
| 43       ], | 44       ], | 
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 182         '../content/browser/renderer_host/mock_render_process_host.cc', | 183         '../content/browser/renderer_host/mock_render_process_host.cc', | 
| 183         '../content/browser/renderer_host/mock_render_process_host.h', | 184         '../content/browser/renderer_host/mock_render_process_host.h', | 
| 184         '../content/browser/renderer_host/test_backing_store.cc', | 185         '../content/browser/renderer_host/test_backing_store.cc', | 
| 185         '../content/browser/renderer_host/test_backing_store.h', | 186         '../content/browser/renderer_host/test_backing_store.h', | 
| 186         '../content/browser/renderer_host/test_render_view_host.cc', | 187         '../content/browser/renderer_host/test_render_view_host.cc', | 
| 187         '../content/browser/renderer_host/test_render_view_host.h', | 188         '../content/browser/renderer_host/test_render_view_host.h', | 
| 188         '../content/browser/tab_contents/test_tab_contents.cc', | 189         '../content/browser/tab_contents/test_tab_contents.cc', | 
| 189         '../content/browser/tab_contents/test_tab_contents.h', | 190         '../content/browser/tab_contents/test_tab_contents.h', | 
| 190         '../content/common/notification_observer_mock.cc', | 191         '../content/common/notification_observer_mock.cc', | 
| 191         '../content/common/notification_observer_mock.h', | 192         '../content/common/notification_observer_mock.h', | 
|  | 193         '../ui/gfx/image_unittest_util.h', | 
|  | 194         '../ui/gfx/image_unittest_util.cc', | 
| 192       ], | 195       ], | 
| 193       'conditions': [ | 196       'conditions': [ | 
| 194         ['OS=="linux"', { | 197         ['OS=="linux"', { | 
| 195           'dependencies': [ | 198           'dependencies': [ | 
| 196             '../build/linux/system.gyp:gtk', | 199             '../build/linux/system.gyp:gtk', | 
| 197             '../build/linux/system.gyp:nss', | 200             '../build/linux/system.gyp:nss', | 
| 198           ], | 201           ], | 
| 199         }], | 202         }], | 
| 200         ['OS=="win"', { | 203         ['OS=="win"', { | 
| 201           'include_dirs': [ | 204           'include_dirs': [ | 
| 202             '<(DEPTH)/third_party/wtl/include', | 205             '<(DEPTH)/third_party/wtl/include', | 
| 203           ], | 206           ], | 
| 204         }], | 207         }], | 
| 205       ], | 208       ], | 
| 206     }, | 209     }, | 
| 207     { | 210     { | 
| 208       'target_name': 'test_support_ui', | 211       'target_name': 'test_support_ui', | 
| 209       'type': '<(library)', | 212       'type': '<(library)', | 
| 210       'dependencies': [ | 213       'dependencies': [ | 
| 211         'test_support_common', | 214         'test_support_common', | 
| 212         'chrome_resources', | 215         'chrome_resources', | 
| 213         'chrome_strings', | 216         'chrome_strings', | 
| 214         'theme_resources', | 217         'theme_resources', | 
|  | 218         'theme_resources_standard', | 
| 215         '../skia/skia.gyp:skia', | 219         '../skia/skia.gyp:skia', | 
| 216         '../testing/gtest.gyp:gtest', | 220         '../testing/gtest.gyp:gtest', | 
| 217       ], | 221       ], | 
| 218       'export_dependent_settings': [ | 222       'export_dependent_settings': [ | 
| 219         'test_support_common', | 223         'test_support_common', | 
| 220       ], | 224       ], | 
| 221       'include_dirs': [ | 225       'include_dirs': [ | 
| 222         '..', | 226         '..', | 
| 223       ], | 227       ], | 
| 224       'sources': [ | 228       'sources': [ | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 344     { | 348     { | 
| 345       'target_name': 'automated_ui_tests', | 349       'target_name': 'automated_ui_tests', | 
| 346       'type': 'executable', | 350       'type': 'executable', | 
| 347       'msvs_guid': 'D2250C20-3A94-4FB9-AF73-11BC5B73884B', | 351       'msvs_guid': 'D2250C20-3A94-4FB9-AF73-11BC5B73884B', | 
| 348       'dependencies': [ | 352       'dependencies': [ | 
| 349         'browser', | 353         'browser', | 
| 350         'renderer', | 354         'renderer', | 
| 351         'test_support_common', | 355         'test_support_common', | 
| 352         'test_support_ui', | 356         'test_support_ui', | 
| 353         'theme_resources', | 357         'theme_resources', | 
|  | 358         'theme_resources_standard', | 
| 354         '../base/base.gyp:base', | 359         '../base/base.gyp:base', | 
| 355         '../skia/skia.gyp:skia', | 360         '../skia/skia.gyp:skia', | 
| 356         '../third_party/libxml/libxml.gyp:libxml', | 361         '../third_party/libxml/libxml.gyp:libxml', | 
| 357         '../testing/gtest.gyp:gtest', | 362         '../testing/gtest.gyp:gtest', | 
| 358       ], | 363       ], | 
| 359       'include_dirs': [ | 364       'include_dirs': [ | 
| 360         '..', | 365         '..', | 
| 361       ], | 366       ], | 
| 362       'sources': [ | 367       'sources': [ | 
| 363         'test/automated_ui_tests/automated_ui_test_interactive_test.cc', | 368         'test/automated_ui_tests/automated_ui_test_interactive_test.cc', | 
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 530             # automatically from direct_dependent_settings in | 535             # automatically from direct_dependent_settings in | 
| 531             # their various targets (net.gyp:net_resources, etc.), | 536             # their various targets (net.gyp:net_resources, etc.), | 
| 532             # but that causes errors in other targets when | 537             # but that causes errors in other targets when | 
| 533             # resulting .res files get referenced multiple times. | 538             # resulting .res files get referenced multiple times. | 
| 534             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 539             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 535             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 540             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 536             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 541             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 537             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 542             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 538             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 543             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 
| 539             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 544             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 545             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 540             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 546             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 541             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 547             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
| 542             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 548             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
| 543             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 549             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
| 544 | 550 | 
| 545             'browser/accessibility/accessibility_win_browsertest.cc', | 551             'browser/accessibility/accessibility_win_browsertest.cc', | 
| 546             'browser/accessibility/browser_views_accessibility_browsertest.cc', | 552             'browser/accessibility/browser_views_accessibility_browsertest.cc', | 
| 547           ], | 553           ], | 
| 548           'conditions': [ | 554           'conditions': [ | 
| 549             ['win_use_allocator_shim==1', { | 555             ['win_use_allocator_shim==1', { | 
| (...skipping 1525 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2075             # automatically from direct_dependent_settings in | 2081             # automatically from direct_dependent_settings in | 
| 2076             # their various targets (net.gyp:net_resources, etc.), | 2082             # their various targets (net.gyp:net_resources, etc.), | 
| 2077             # but that causes errors in other targets when | 2083             # but that causes errors in other targets when | 
| 2078             # resulting .res files get referenced multiple times. | 2084             # resulting .res files get referenced multiple times. | 
| 2079             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2085             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 2080             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 2086             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 2081             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2087             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 2082             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 2088             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 2083             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2089             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 
| 2084             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2090             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 2091             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 2085             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 2092             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 2086             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2093             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
| 2087             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2094             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
| 2088             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2095             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
| 2089           ], | 2096           ], | 
| 2090           'link_settings': { | 2097           'link_settings': { | 
| 2091             'libraries': [ | 2098             'libraries': [ | 
| 2092               '-lcomsupp.lib', | 2099               '-lcomsupp.lib', | 
| 2093               '-loleacc.lib', | 2100               '-loleacc.lib', | 
| 2094               '-lrpcrt4.lib', | 2101               '-lrpcrt4.lib', | 
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2431         ['OS=="win"', { | 2438         ['OS=="win"', { | 
| 2432           'sources': [ | 2439           'sources': [ | 
| 2433             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2440             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 2434             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 2441             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 2435             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2442             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 2436             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 2443             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 2437             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 2444             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 2438             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2445             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
| 2439             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2446             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 
| 2440             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2447             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 2448             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 2441             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2449             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
| 2442             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2450             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
| 2443             # TODO(alekseys): port sidebar to linux/mac. | 2451             # TODO(alekseys): port sidebar to linux/mac. | 
| 2444             'browser/sidebar/sidebar_browsertest.cc', | 2452             'browser/sidebar/sidebar_browsertest.cc', | 
| 2445           ], | 2453           ], | 
| 2446           'include_dirs': [ | 2454           'include_dirs': [ | 
| 2447             '<(DEPTH)/third_party/wtl/include', | 2455             '<(DEPTH)/third_party/wtl/include', | 
| 2448           ], | 2456           ], | 
| 2449           'dependencies': [ | 2457           'dependencies': [ | 
| 2450             'chrome_dll_version', | 2458             'chrome_dll_version', | 
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2584           ], | 2592           ], | 
| 2585           'sources': [ | 2593           'sources': [ | 
| 2586             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2594             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 2587             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 2595             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 2588             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2596             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 2589             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 2597             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 2590             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 2598             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 2591             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2599             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
| 2592             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2600             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 
| 2593             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2601             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 2602             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 2594             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2603             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
| 2595             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2604             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
| 2596           ], | 2605           ], | 
| 2597           'configurations': { | 2606           'configurations': { | 
| 2598             'Debug_Base': { | 2607             'Debug_Base': { | 
| 2599               'msvs_settings': { | 2608               'msvs_settings': { | 
| 2600                 'VCLinkerTool': { | 2609                 'VCLinkerTool': { | 
| 2601                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 2610                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 
| 2602                 }, | 2611                 }, | 
| 2603               }, | 2612               }, | 
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2703       #   c) Strip the binary if it's a debug build. (binary may be over 2GB) | 2712       #   c) Strip the binary if it's a debug build. (binary may be over 2GB) | 
| 2704       'target_name': 'reliability_tests', | 2713       'target_name': 'reliability_tests', | 
| 2705       'type': 'executable', | 2714       'type': 'executable', | 
| 2706       'msvs_guid': '8A3E1774-1DE9-445C-982D-3EE37C8A752A', | 2715       'msvs_guid': '8A3E1774-1DE9-445C-982D-3EE37C8A752A', | 
| 2707       'dependencies': [ | 2716       'dependencies': [ | 
| 2708         'browser', | 2717         'browser', | 
| 2709         'chrome', | 2718         'chrome', | 
| 2710         'test_support_common', | 2719         'test_support_common', | 
| 2711         'test_support_ui', | 2720         'test_support_ui', | 
| 2712         'theme_resources', | 2721         'theme_resources', | 
|  | 2722         'theme_resources_standard', | 
| 2713         '../skia/skia.gyp:skia', | 2723         '../skia/skia.gyp:skia', | 
| 2714         '../testing/gtest.gyp:gtest', | 2724         '../testing/gtest.gyp:gtest', | 
| 2715         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 2725         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 
| 2716       ], | 2726       ], | 
| 2717       'include_dirs': [ | 2727       'include_dirs': [ | 
| 2718         '..', | 2728         '..', | 
| 2719       ], | 2729       ], | 
| 2720       'sources': [ | 2730       'sources': [ | 
| 2721         'test/reliability/page_load_test.cc', | 2731         'test/reliability/page_load_test.cc', | 
| 2722         'test/reliability/page_load_test.h', | 2732         'test/reliability/page_load_test.h', | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2805       'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98', | 2815       'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98', | 
| 2806       'run_as': { | 2816       'run_as': { | 
| 2807         'action': ['$(TargetPath)', '--gtest_print_time'], | 2817         'action': ['$(TargetPath)', '--gtest_print_time'], | 
| 2808       }, | 2818       }, | 
| 2809       'dependencies': [ | 2819       'dependencies': [ | 
| 2810         'chrome', | 2820         'chrome', | 
| 2811         'debugger', | 2821         'debugger', | 
| 2812         'test_support_common', | 2822         'test_support_common', | 
| 2813         'test_support_ui', | 2823         'test_support_ui', | 
| 2814         'theme_resources', | 2824         'theme_resources', | 
|  | 2825         'theme_resources_standard', | 
| 2815         '../base/base.gyp:base', | 2826         '../base/base.gyp:base', | 
| 2816         '../skia/skia.gyp:skia', | 2827         '../skia/skia.gyp:skia', | 
| 2817         '../testing/gtest.gyp:gtest', | 2828         '../testing/gtest.gyp:gtest', | 
| 2818       ], | 2829       ], | 
| 2819       'include_dirs': [ | 2830       'include_dirs': [ | 
| 2820         '..', | 2831         '..', | 
| 2821       ], | 2832       ], | 
| 2822       'sources': [ | 2833       'sources': [ | 
| 2823         'test/tab_switching/tab_switching_test.cc', | 2834         'test/tab_switching/tab_switching_test.cc', | 
| 2824       ], | 2835       ], | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 2839     { | 2850     { | 
| 2840       'target_name': 'memory_test', | 2851       'target_name': 'memory_test', | 
| 2841       'type': 'executable', | 2852       'type': 'executable', | 
| 2842       'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE', | 2853       'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE', | 
| 2843       'dependencies': [ | 2854       'dependencies': [ | 
| 2844         'chrome', | 2855         'chrome', | 
| 2845         'debugger', | 2856         'debugger', | 
| 2846         'test_support_common', | 2857         'test_support_common', | 
| 2847         'test_support_ui', | 2858         'test_support_ui', | 
| 2848         'theme_resources', | 2859         'theme_resources', | 
|  | 2860         'theme_resources_standard', | 
| 2849         '../base/base.gyp:base', | 2861         '../base/base.gyp:base', | 
| 2850         '../skia/skia.gyp:skia', | 2862         '../skia/skia.gyp:skia', | 
| 2851         '../testing/gtest.gyp:gtest', | 2863         '../testing/gtest.gyp:gtest', | 
| 2852       ], | 2864       ], | 
| 2853       'include_dirs': [ | 2865       'include_dirs': [ | 
| 2854         '..', | 2866         '..', | 
| 2855       ], | 2867       ], | 
| 2856       'sources': [ | 2868       'sources': [ | 
| 2857         'test/memory_test/memory_test.cc', | 2869         'test/memory_test/memory_test.cc', | 
| 2858       ], | 2870       ], | 
| 2859       'conditions': [ | 2871       'conditions': [ | 
| 2860         ['OS=="linux"', { | 2872         ['OS=="linux"', { | 
| 2861           'dependencies': [ | 2873           'dependencies': [ | 
| 2862             '../build/linux/system.gyp:gtk', | 2874             '../build/linux/system.gyp:gtk', | 
| 2863             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2875             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 
| 2864           ], | 2876           ], | 
| 2865         }], | 2877         }], | 
| 2866       ], | 2878       ], | 
| 2867     }, | 2879     }, | 
| 2868     { | 2880     { | 
| 2869       'target_name': 'url_fetch_test', | 2881       'target_name': 'url_fetch_test', | 
| 2870       'type': 'executable', | 2882       'type': 'executable', | 
| 2871       'msvs_guid': '7EFD0C91-198E-4043-9E71-4A4C7879B929', | 2883       'msvs_guid': '7EFD0C91-198E-4043-9E71-4A4C7879B929', | 
| 2872       'dependencies': [ | 2884       'dependencies': [ | 
| 2873         'chrome', | 2885         'chrome', | 
| 2874         'debugger', | 2886         'debugger', | 
| 2875         'test_support_common', | 2887         'test_support_common', | 
| 2876         'test_support_ui', | 2888         'test_support_ui', | 
| 2877         'theme_resources', | 2889         'theme_resources', | 
|  | 2890         'theme_resources_standard', | 
| 2878         '../base/base.gyp:base', | 2891         '../base/base.gyp:base', | 
| 2879         '../net/net.gyp:net', | 2892         '../net/net.gyp:net', | 
| 2880         '../skia/skia.gyp:skia', | 2893         '../skia/skia.gyp:skia', | 
| 2881         '../testing/gtest.gyp:gtest', | 2894         '../testing/gtest.gyp:gtest', | 
| 2882       ], | 2895       ], | 
| 2883       'include_dirs': [ | 2896       'include_dirs': [ | 
| 2884         '..', | 2897         '..', | 
| 2885       ], | 2898       ], | 
| 2886       'sources': [ | 2899       'sources': [ | 
| 2887         'test/url_fetch_test/url_fetch_test.cc', | 2900         'test/url_fetch_test/url_fetch_test.cc', | 
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3155           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 3168           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 
| 3156         }], | 3169         }], | 
| 3157         ['OS=="win"', { | 3170         ['OS=="win"', { | 
| 3158           'sources': [ | 3171           'sources': [ | 
| 3159             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 3172             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 3160             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 3173             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 3161             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 3174             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 3162             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 3175             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 3163             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 3176             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 3164             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 3177             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 3178             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 3165           ], | 3179           ], | 
| 3166           'include_dirs': [ | 3180           'include_dirs': [ | 
| 3167             '<(DEPTH)/third_party/wtl/include', | 3181             '<(DEPTH)/third_party/wtl/include', | 
| 3168           ], | 3182           ], | 
| 3169           'dependencies': [ | 3183           'dependencies': [ | 
| 3170             'chrome_dll_version', | 3184             'chrome_dll_version', | 
| 3171             'installer_util_strings', | 3185             'installer_util_strings', | 
| 3172             '../sandbox/sandbox.gyp:sandbox', | 3186             '../sandbox/sandbox.gyp:sandbox', | 
| 3173           ], | 3187           ], | 
| 3174           'conditions': [ | 3188           'conditions': [ | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3246           'sources': [ | 3260           'sources': [ | 
| 3247             'app/chrome_dll.rc', | 3261             'app/chrome_dll.rc', | 
| 3248             'app/chrome_dll_resource.h', | 3262             'app/chrome_dll_resource.h', | 
| 3249             'app/chrome_dll_version.rc.version', | 3263             'app/chrome_dll_version.rc.version', | 
| 3250             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 3264             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 
| 3251             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 3265             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', | 
| 3252             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 3266             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 
| 3253             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 3267             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 
| 3254             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 3268             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 
| 3255             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 3269             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 
|  | 3270             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', | 
| 3256             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 3271             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
      ', | 
| 3257             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 3272             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 
| 3258             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 3273             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 
| 3259             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 3274             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 
| 3260           ], | 3275           ], | 
| 3261           'conditions': [ | 3276           'conditions': [ | 
| 3262             ['win_use_allocator_shim==1', { | 3277             ['win_use_allocator_shim==1', { | 
| 3263               'dependencies': [ | 3278               'dependencies': [ | 
| 3264                 '<(allocator_target)', | 3279                 '<(allocator_target)', | 
| 3265               ], | 3280               ], | 
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3562           'type': 'shared_library', | 3577           'type': 'shared_library', | 
| 3563           'product_prefix': '_', | 3578           'product_prefix': '_', | 
| 3564           'dependencies': [ | 3579           'dependencies': [ | 
| 3565             'chrome', | 3580             'chrome', | 
| 3566             'debugger', | 3581             'debugger', | 
| 3567             'syncapi', | 3582             'syncapi', | 
| 3568             'test_support_common', | 3583             'test_support_common', | 
| 3569             'chrome_resources', | 3584             'chrome_resources', | 
| 3570             'chrome_strings', | 3585             'chrome_strings', | 
| 3571             'theme_resources', | 3586             'theme_resources', | 
|  | 3587             'theme_resources_standard', | 
| 3572             '../skia/skia.gyp:skia', | 3588             '../skia/skia.gyp:skia', | 
| 3573             '../testing/gtest.gyp:gtest', | 3589             '../testing/gtest.gyp:gtest', | 
| 3574           ], | 3590           ], | 
| 3575           'export_dependent_settings': [ | 3591           'export_dependent_settings': [ | 
| 3576             'test_support_common', | 3592             'test_support_common', | 
| 3577           ], | 3593           ], | 
| 3578           'include_dirs': [ | 3594           'include_dirs': [ | 
| 3579             '..', | 3595             '..', | 
| 3580           ], | 3596           ], | 
| 3581           'cflags': [ | 3597           'cflags': [ | 
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3873       ] | 3889       ] | 
| 3874     }],  # 'coverage!=0' | 3890     }],  # 'coverage!=0' | 
| 3875   ],  # 'conditions' | 3891   ],  # 'conditions' | 
| 3876 } | 3892 } | 
| 3877 | 3893 | 
| 3878 # Local Variables: | 3894 # Local Variables: | 
| 3879 # tab-width:2 | 3895 # tab-width:2 | 
| 3880 # indent-tabs-mode:nil | 3896 # indent-tabs-mode:nil | 
| 3881 # End: | 3897 # End: | 
| 3882 # vim: set expandtab tabstop=2 shiftwidth=2: | 3898 # vim: set expandtab tabstop=2 shiftwidth=2: | 
| OLD | NEW | 
|---|