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

Side by Side Diff: content/content_shell.gypi

Issue 11144012: [content shell] Update dependencies for content shell layout tests from DumpRenderTree to TestRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | content/content_tests.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 'target_name': 'content_shell', 298 'target_name': 'content_shell',
299 'type': 'executable', 299 'type': 'executable',
300 'mac_bundle': 1, 300 'mac_bundle': 1,
301 'defines!': ['CONTENT_IMPLEMENTATION'], 301 'defines!': ['CONTENT_IMPLEMENTATION'],
302 'variables': { 302 'variables': {
303 'chromium_code': 1, 303 'chromium_code': 1,
304 }, 304 },
305 'dependencies': [ 305 'dependencies': [
306 'content_shell_lib', 306 'content_shell_lib',
307 'content_shell_pak', 307 'content_shell_pak',
308 '../third_party/mesa/mesa.gyp:osmesa',
309 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTre e.gyp:TestRunner_resources',
308 ], 310 ],
309 'include_dirs': [ 311 'include_dirs': [
310 '..', 312 '..',
311 ], 313 ],
312 'sources': [ 314 'sources': [
313 'app/startup_helper_win.cc', 315 'app/startup_helper_win.cc',
314 'shell/shell_main.cc', 316 'shell/shell_main.cc',
315 ], 317 ],
316 'mac_bundle_resources': [ 318 'mac_bundle_resources': [
317 'shell/mac/app.icns', 319 'shell/mac/app.icns',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 }, 431 },
430 ], 432 ],
431 }], # OS=="mac" 433 }], # OS=="mac"
432 ], 434 ],
433 }, 435 },
434 { 436 {
435 'target_name': 'content_shell_builder', 437 'target_name': 'content_shell_builder',
436 'type': 'none', 438 'type': 'none',
437 'dependencies': [ 439 'dependencies': [
438 'content_shell', 440 'content_shell',
439 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTre e.gyp:DumpRenderTree',
440 ], 441 ],
441 }, 442 },
442 ], 443 ],
443 'conditions': [ 444 'conditions': [
444 ['OS=="mac"', { 445 ['OS=="mac"', {
445 'targets': [ 446 'targets': [
446 { 447 {
447 'target_name': 'content_shell_framework', 448 'target_name': 'content_shell_framework',
448 'type': 'shared_library', 449 'type': 'shared_library',
449 'product_name': '<(content_shell_product_name) Framework', 450 'product_name': '<(content_shell_product_name) Framework',
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 'resource_dir': '../res', 658 'resource_dir': '../res',
658 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'], 659 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'],
659 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 660 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
660 }, 661 },
661 'includes': [ '../build/java_apk.gypi' ], 662 'includes': [ '../build/java_apk.gypi' ],
662 }, 663 },
663 ], 664 ],
664 }], # OS=="android" 665 }], # OS=="android"
665 ] 666 ]
666 } 667 }
OLDNEW
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698