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

Side by Side Diff: content/content_tests.gypi

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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
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 '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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 '../ui/ui.gyp:ui', 540 '../ui/ui.gyp:ui',
541 '../webkit/support/webkit_support.gyp:glue', 541 '../webkit/support/webkit_support.gyp:glue',
542 ], 542 ],
543 'include_dirs': [ 543 'include_dirs': [
544 '..', 544 '..',
545 ], 545 ],
546 'defines': [ 546 'defines': [
547 'HAS_OUT_OF_PROC_TEST_RUNNER', 547 'HAS_OUT_OF_PROC_TEST_RUNNER',
548 ], 548 ],
549 'sources': [ 549 'sources': [
550 'browser/plugin_browsertest.cc',
550 'test/content_browser_test.h', 551 'test/content_browser_test.h',
551 'test/content_browser_test.cc', 552 'test/content_browser_test.cc',
552 'test/content_browser_test_utils.cc', 553 'test/content_browser_test_utils.cc',
553 'test/content_browser_test_utils.h', 554 'test/content_browser_test_utils.h',
555 'test/content_browser_test_utils_mac.mm',
554 'test/content_browser_test_test.cc', 556 'test/content_browser_test_test.cc',
555 'test/content_test_launcher.cc', 557 'test/content_test_launcher.cc',
556 ], 558 ],
557 'conditions': [ 559 'conditions': [
558 ['OS=="win"', { 560 ['OS=="win"', {
559 'resource_include_dirs': [ 561 'resource_include_dirs': [
560 '<(SHARED_INTERMEDIATE_DIR)/webkit', 562 '<(SHARED_INTERMEDIATE_DIR)/webkit',
561 ], 563 ],
562 'sources': [ 564 'sources': [
563 'shell/resource.h', 565 'shell/resource.h',
(...skipping 26 matching lines...) Expand all
590 ['OS=="win" and win_use_allocator_shim==1', { 592 ['OS=="win" and win_use_allocator_shim==1', {
591 'dependencies': [ 593 'dependencies': [
592 '../base/allocator/allocator.gyp:allocator', 594 '../base/allocator/allocator.gyp:allocator',
593 ], 595 ],
594 }], 596 }],
595 ['OS=="mac"', { 597 ['OS=="mac"', {
596 'dependencies': [ 598 'dependencies': [
597 'content_shell', # Needed for Content Shell.app's Helper. 599 'content_shell', # Needed for Content Shell.app's Helper.
598 ], 600 ],
599 }], 601 }],
602 ['use_aura==1', {
603 'sources!': [
604 'browser/plugin_browsertest.cc',
605 ],
606 }],
607 ['target_arch!="arm"', {
608 'dependencies': [
609 # Runtime dependencies
610 '../webkit/webkit.gyp:copy_npapi_test_plugin',
611 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
612 ],
613 }],
600 ], 614 ],
601 }, 615 },
602 ], 616 ],
603 'conditions': [ 617 'conditions': [
604 ['chromeos==1 or OS=="linux" or OS=="win" or OS=="mac"', { 618 ['chromeos==1 or OS=="linux" or OS=="win" or OS=="mac"', {
605 'targets': [ 619 'targets': [
606 { 620 {
607 'target_name': 'video_decode_accelerator_unittest', 621 'target_name': 'video_decode_accelerator_unittest',
608 'type': 'executable', 622 'type': 'executable',
609 'dependencies': [ 623 'dependencies': [
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', 714 '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
701 '<(PRODUCT_DIR)/lib.java/chromium_net.jar', 715 '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
702 ], 716 ],
703 }, 717 },
704 'includes': [ '../build/apk_test.gypi' ], 718 'includes': [ '../build/apk_test.gypi' ],
705 }, 719 },
706 ], 720 ],
707 }], 721 }],
708 ], 722 ],
709 } 723 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698