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

Side by Side Diff: chrome/test/interactive_ui/interactive_ui_tests.gypi

Issue 792005: Move devtool resources from webkit_resources.grd to renderer_resources.grd. (Closed)
Patch Set: split Created 10 years, 9 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/renderer/devtools_agent.cc ('k') | webkit/glue/webkit_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 # automatically from direct_dependent_settings in 117 # automatically from direct_dependent_settings in
118 # their various targets (net.gyp:net_resources, etc.), 118 # their various targets (net.gyp:net_resources, etc.),
119 # but that causes errors in other targets when 119 # but that causes errors in other targets when
120 # resulting .res files get referenced multiple times. 120 # resulting .res files get referenced multiple times.
121 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 121 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
122 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 122 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
123 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 123 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
124 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 124 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
125 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 125 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
126 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 126 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
127 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.rc',
127 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 128 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
128 ], 129 ],
129 'conditions': [ 130 'conditions': [
130 ['win_use_allocator_shim==1', { 131 ['win_use_allocator_shim==1', {
131 'dependencies': [ 132 'dependencies': [
132 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 133 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
133 ], 134 ],
134 }], 135 }],
135 ], 136 ],
136 'configurations': { 137 'configurations': {
137 'Debug_Base': { 138 'Debug_Base': {
138 'msvs_settings': { 139 'msvs_settings': {
139 'VCLinkerTool': { 140 'VCLinkerTool': {
140 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 141 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
141 }, 142 },
142 }, 143 },
143 }, 144 },
144 }, # configurations 145 }, # configurations
145 }], # OS=="win" 146 }], # OS=="win"
146 ], # conditions 147 ], # conditions
147 } 148 }
OLDNEW
« no previous file with comments | « chrome/renderer/devtools_agent.cc ('k') | webkit/glue/webkit_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698