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

Side by Side Diff: chrome/chrome.gyp

Issue 100213009: Stop building Chrome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to r242769 Created 6 years, 11 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 | « build/all.gyp ('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 # 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 { 'targets': [ 759 { 'targets': [
760 { 760 {
761 # For historical reasons, chrome/chrome.sln has been the entry point 761 # For historical reasons, chrome/chrome.sln has been the entry point
762 # for new Chrome developers. To assist development, include several 762 # for new Chrome developers. To assist development, include several
763 # core unittests that are otherwise only accessible side-by-side with 763 # core unittests that are otherwise only accessible side-by-side with
764 # chrome via all/all.sln. 764 # chrome via all/all.sln.
765 'target_name': 'test_targets', 765 'target_name': 'test_targets',
766 'type': 'none', 766 'type': 'none',
767 'dependencies': [ 767 'dependencies': [
768 '../base/base.gyp:base_unittests', 768 '../base/base.gyp:base_unittests',
769 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
770 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
771 '../content/content_shell_and_tests.gyp:content_browsertests', 769 '../content/content_shell_and_tests.gyp:content_browsertests',
772 '../content/content_shell_and_tests.gyp:content_shell', 770 '../content/content_shell_and_tests.gyp:content_shell',
773 '../content/content_shell_and_tests.gyp:content_unittests', 771 '../content/content_shell_and_tests.gyp:content_unittests',
774 '../net/net.gyp:net_unittests', 772 '../net/net.gyp:net_unittests',
775 '../ui/ui_unittests.gyp:ui_unittests', 773 '../ui/ui_unittests.gyp:ui_unittests',
776 ], 774 ],
777 'conditions': [
778 ['use_aura==1 or target_arch=="x64"', {
779 'dependencies!': [
780 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
781 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
782 ],
783 }],
784 ],
785 }, 775 },
786 { 776 {
787 'target_name': 'chrome_version_resources', 777 'target_name': 'chrome_version_resources',
788 'type': 'none', 778 'type': 'none',
789 'conditions': [ 779 'conditions': [
790 ['branding == "Chrome"', { 780 ['branding == "Chrome"', {
791 'variables': { 781 'variables': {
792 'branding_path': 'app/theme/google_chrome/BRANDING', 782 'branding_path': 'app/theme/google_chrome/BRANDING',
793 }, 783 },
794 }, { # else branding!="Chrome" 784 }, { # else branding!="Chrome"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 'sources': [ 1103 'sources': [
1114 'service/cloud_print/print_system_dummy.cc', 1104 'service/cloud_print/print_system_dummy.cc',
1115 ], 1105 ],
1116 }], 1106 }],
1117 ], 1107 ],
1118 }, 1108 },
1119 ], 1109 ],
1120 }], 1110 }],
1121 ], # 'conditions' 1111 ], # 'conditions'
1122 } 1112 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698