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

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

Issue 455037: Make no-tcmalloc (really, non-base/allocator) builds work again,... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years 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/renderer/render_thread.cc ('k') | no next file » | 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', 89 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
90 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', 90 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
91 ], 91 ],
92 }], # OS=="mac" 92 }], # OS=="mac"
93 ['OS=="win"', { 93 ['OS=="win"', {
94 'include_dirs': [ 94 'include_dirs': [
95 '<(DEPTH)/chrome/third_party/wtl/include', 95 '<(DEPTH)/chrome/third_party/wtl/include',
96 ], 96 ],
97 'dependencies': [ 97 'dependencies': [
98 '<(DEPTH)/app/app.gyp:app_resources', 98 '<(DEPTH)/app/app.gyp:app_resources',
99 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
100 '<(DEPTH)/chrome/chrome.gyp:chrome_dll_version', 99 '<(DEPTH)/chrome/chrome.gyp:chrome_dll_version',
101 '<(DEPTH)/chrome/chrome.gyp:crash_service', # run time dependency 100 '<(DEPTH)/chrome/chrome.gyp:crash_service', # run time dependency
102 '<(DEPTH)/chrome/installer/installer.gyp:installer_util_strings', 101 '<(DEPTH)/chrome/installer/installer.gyp:installer_util_strings',
103 '<(DEPTH)/views/views.gyp:views', 102 '<(DEPTH)/views/views.gyp:views',
104 ], 103 ],
105 'sources': [ 104 'sources': [
106 '<(DEPTH)/webkit/glue/resources/aliasb.cur', 105 '<(DEPTH)/webkit/glue/resources/aliasb.cur',
107 '<(DEPTH)/webkit/glue/resources/cell.cur', 106 '<(DEPTH)/webkit/glue/resources/cell.cur',
108 '<(DEPTH)/webkit/glue/resources/col_resize.cur', 107 '<(DEPTH)/webkit/glue/resources/col_resize.cur',
109 '<(DEPTH)/webkit/glue/resources/copy.cur', 108 '<(DEPTH)/webkit/glue/resources/copy.cur',
(...skipping 11 matching lines...) Expand all
121 # but that causes errors in other targets when 120 # but that causes errors in other targets when
122 # resulting .res files get referenced multiple times. 121 # resulting .res files get referenced multiple times.
123 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 122 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
124 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 123 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
125 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 124 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
126 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 125 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
127 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 126 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
128 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 127 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
129 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 128 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
130 ], 129 ],
130 'conditions': [
131 ['win_use_allocator_shim==1', {
132 'dependencies': [
133 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
134 ],
135 }],
136 ],
131 'configurations': { 137 'configurations': {
132 'Debug': { 138 'Debug': {
133 'msvs_settings': { 139 'msvs_settings': {
134 'VCLinkerTool': { 140 'VCLinkerTool': {
135 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 141 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
136 }, 142 },
137 }, 143 },
138 }, 144 },
139 }, # configurations 145 }, # configurations
140 }], # OS=="win" 146 }], # OS=="win"
141 ], # conditions 147 ], # conditions
142 } 148 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698