| OLD | NEW |
| 1 { | 1 { |
| 2 'target_name': 'interactive_ui_tests', | 2 'target_name': 'interactive_ui_tests', |
| 3 'type': 'executable', | 3 'type': 'executable', |
| 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', | 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', |
| 5 'dependencies': [ | 5 'dependencies': [ |
| 6 '<(DEPTH)/chrome/chrome.gyp:chrome', | 6 '<(DEPTH)/chrome/chrome.gyp:chrome', |
| 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', | 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', |
| 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', | 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', |
| 9 '<(DEPTH)/chrome/chrome.gyp:debugger', | 9 '<(DEPTH)/chrome/chrome.gyp:debugger', |
| 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', | 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 '<(DEPTH)/webkit/glue/resources/zoom_out.cur', | 107 '<(DEPTH)/webkit/glue/resources/zoom_out.cur', |
| 108 | 108 |
| 109 '<(DEPTH)/chrome/app/chrome_dll.rc', | 109 '<(DEPTH)/chrome/app/chrome_dll.rc', |
| 110 '<(DEPTH)/chrome/test/data/resource.rc', | 110 '<(DEPTH)/chrome/test/data/resource.rc', |
| 111 | 111 |
| 112 # TODO: It would be nice to have these pulled in | 112 # TODO: It would be nice to have these pulled in |
| 113 # automatically from direct_dependent_settings in | 113 # automatically from direct_dependent_settings in |
| 114 # their various targets (net.gyp:net_resources, etc.), | 114 # their various targets (net.gyp:net_resources, etc.), |
| 115 # but that causes errors in other targets when | 115 # but that causes errors in other targets when |
| 116 # resulting .res files get referenced multiple times. | 116 # resulting .res files get referenced multiple times. |
| 117 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc', |
| 117 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 118 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 118 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 119 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 119 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 120 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 121 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 120 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 122 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 121 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 123 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 122 ], | 124 ], |
| 123 'configurations': { | 125 'configurations': { |
| 124 'Debug': { | 126 'Debug': { |
| 125 'msvs_settings': { | 127 'msvs_settings': { |
| 126 'VCLinkerTool': { | 128 'VCLinkerTool': { |
| 127 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 129 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 128 }, | 130 }, |
| 129 }, | 131 }, |
| 130 }, | 132 }, |
| 131 }, # configurations | 133 }, # configurations |
| 132 }], # OS=="win" | 134 }], # OS=="win" |
| 133 ], # conditions | 135 ], # conditions |
| 134 } | 136 } |
| OLD | NEW |