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

Side by Side Diff: content/content_tests.gypi

Issue 8137012: Make an empty content browser test work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « content/content_shell.gypi ('k') | content/shell/shell_main.cc » ('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 (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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 }, 213 },
214 { 214 {
215 'target_name': 'content_browsertests', 215 'target_name': 'content_browsertests',
216 'type': 'executable', 216 'type': 'executable',
217 'defines!': ['CONTENT_IMPLEMENTATION'], 217 'defines!': ['CONTENT_IMPLEMENTATION'],
218 'dependencies': [ 218 'dependencies': [
219 'content_browser', 219 'content_browser',
220 'content_gpu', 220 'content_gpu',
221 'content_plugin', 221 'content_plugin',
222 'content_renderer', 222 'content_renderer',
223 'content_shell_lib',
223 'test_support_content', 224 'test_support_content',
224 '../base/base.gyp:test_support_base', 225 '../base/base.gyp:test_support_base',
225 '../net/net.gyp:net_test_support', 226 '../net/net.gyp:net_test_support',
227 '../skia/skia.gyp:skia',
226 '../testing/gtest.gyp:gtest', 228 '../testing/gtest.gyp:gtest',
227 '../ui/ui.gyp:ui', 229 '../ui/ui.gyp:ui',
228 '../webkit/support/webkit_support.gyp:glue', 230 '../webkit/support/webkit_support.gyp:glue',
229 ], 231 ],
230 'include_dirs': [ 232 'include_dirs': [
231 '..', 233 '..',
232 ], 234 ],
233 'defines': [ 235 'defines': [
234 'HAS_OUT_OF_PROC_TEST_RUNNER', 236 'HAS_OUT_OF_PROC_TEST_RUNNER',
235 ], 237 ],
236 'sources': [ 238 'sources': [
237 'test/content_browser_test.h', 239 'test/content_browser_test.h',
238 'test/content_browser_test.cc', 240 'test/content_browser_test.cc',
239 'test/content_test_launcher.cc', 241 'test/content_test_launcher.cc',
240 'test/test_launcher.cc', 242 'test/test_launcher.cc',
241 'test/test_launcher.h', 243 'test/test_launcher.h',
242 ], 244 ],
243 'conditions': [ 245 'conditions': [
244 ['OS=="win"', { 246 ['OS=="win"', {
245 'dependencies': [
246 '../sandbox/sandbox.gyp:sandbox',
247 ],
248 'link_settings': { 247 'link_settings': {
249 'libraries': [ 248 'libraries': [
250 '-lcomctl32.lib', 249 '-lcomctl32.lib',
251 ], 250 ],
252 }, 251 },
252 'resource_include_dirs': [
253 '<(SHARED_INTERMEDIATE_DIR)/webkit',
254 ],
255 'sources': [
256 'shell/resource.h',
257 'shell/shell.rc',
258 # TODO: It would be nice to have these pulled in
259 # automatically from direct_dependent_settings in
260 # their various targets (net.gyp:net_resources, etc.),
261 # but that causes errors in other targets when
262 # resulting .res files get referenced multiple times.
263 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
264 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
265 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
266 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
267 ],
268 'dependencies': [
269 '<(DEPTH)/net/net.gyp:net_resources',
270 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
271 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
272 '../sandbox/sandbox.gyp:sandbox',
273 ],
274 'configurations': {
275 'Debug_Base': {
276 'msvs_settings': {
277 'VCLinkerTool': {
278 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
279 },
280 },
281 },
282 },
253 }], 283 }],
254 ['OS=="win" and win_use_allocator_shim==1', { 284 ['OS=="win" and win_use_allocator_shim==1', {
255 'dependencies': [ 285 'dependencies': [
256 '../base/allocator/allocator.gyp:allocator', 286 '../base/allocator/allocator.gyp:allocator',
257 ], 287 ],
258 }], 288 }],
259 ], 289 ],
260 }, 290 },
261 ], 291 ],
262 'conditions': [ 292 'conditions': [
(...skipping 14 matching lines...) Expand all
277 ], 307 ],
278 'sources': [ 308 'sources': [
279 'common/gpu/media/omx_video_decode_accelerator_unittest.cc', 309 'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
280 ], 310 ],
281 } 311 }
282 ], 312 ],
283 }, 313 },
284 ], 314 ],
285 ], 315 ],
286 } 316 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698