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

Side by Side Diff: chrome/chrome.gyp

Issue 112085: Comment out 'browser_tests_{dll,launcher}' until we can fix... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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 | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'chromium_code': 1, 7 'chromium_code': 1,
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 3824 matching lines...) Expand 10 before | Expand all | Expand 10 after
3835 'test/automation/browser_proxy.cc', 3835 'test/automation/browser_proxy.cc',
3836 'test/automation/browser_proxy.h', 3836 'test/automation/browser_proxy.h',
3837 'test/automation/constrained_window_proxy.cc', 3837 'test/automation/constrained_window_proxy.cc',
3838 'test/automation/constrained_window_proxy.h', 3838 'test/automation/constrained_window_proxy.h',
3839 'test/automation/tab_proxy.cc', 3839 'test/automation/tab_proxy.cc',
3840 'test/automation/tab_proxy.h', 3840 'test/automation/tab_proxy.h',
3841 'test/automation/window_proxy.cc', 3841 'test/automation/window_proxy.cc',
3842 'test/automation/window_proxy.h', 3842 'test/automation/window_proxy.h',
3843 ], 3843 ],
3844 }, 3844 },
3845 { 3845 # TODO(sgk,bradnelson): re-enable once problems with
3846 'target_name': 'browser_tests', 3846 # LNK1104 errors for browser_tests.{ilk,pdb} have been fixed.
3847 'type': 'executable', 3847 #{
3848 'msvs_guid': '9B87804D-2502-480B-95AE-5A572CE91809', 3848 # 'target_name': 'browser_tests',
3849 'msvs_existing_vcproj': 'test/browser/browser_tests_launcher.vcproj', 3849 # 'type': 'executable',
3850 'dependencies': [ 3850 # 'msvs_guid': '9B87804D-2502-480B-95AE-5A572CE91809',
3851 'installer/installer.gyp:installer_util', 3851 # 'msvs_existing_vcproj': 'test/browser/browser_tests_launcher.vcproj',
3852 ], 3852 # 'dependencies': [
3853 'include_dirs': [ 3853 # 'installer/installer.gyp:installer_util',
3854 '..', 3854 # ],
3855 ], 3855 # 'include_dirs': [
3856 'sources': [ 3856 # '..',
3857 'test/browser/browser_tests_launcher.cc', 3857 # ],
3858 ], 3858 # 'sources': [
3859 }, 3859 # 'test/browser/browser_tests_launcher.cc',
3860 { 3860 # ],
3861 'target_name': 'browser_tests_dll', 3861 #},
3862 'type': 'shared_library', 3862 #{
3863 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F', 3863 # 'target_name': 'browser_tests_dll',
3864 'msvs_existing_vcproj': 'test/browser/browser_tests_dll.vcproj', 3864 # 'type': 'shared_library',
3865 'product_name': 'browser_tests', 3865 # 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F',
3866 'dependencies': [ 3866 # 'msvs_existing_vcproj': 'test/browser/browser_tests_dll.vcproj',
3867 'browser', 3867 # 'product_name': 'browser_tests',
3868 'chrome_resources', 3868 # 'dependencies': [
3869 'debugger', 3869 # 'browser',
3870 'renderer', 3870 # 'chrome_resources',
3871 'installer/installer.gyp:installer_util_strings', 3871 # 'debugger',
3872 '../base/base.gyp:base', 3872 # 'renderer',
3873 '../base/base.gyp:base_gfx', 3873 # 'installer/installer.gyp:installer_util_strings',
3874 '../net/net.gyp:net', 3874 # '../base/base.gyp:base',
3875 '../net/net.gyp:net_resources', 3875 # '../base/base.gyp:base_gfx',
3876 '../skia/skia.gyp:skia', 3876 # '../net/net.gyp:net',
3877 '../testing/gtest.gyp:gtest', 3877 # '../net/net.gyp:net_resources',
3878 '../webkit/webkit.gyp:glue', 3878 # '../skia/skia.gyp:skia',
3879 '../webkit/webkit.gyp:webkit_resources', 3879 # '../testing/gtest.gyp:gtest',
3880 ], 3880 # '../webkit/webkit.gyp:glue',
3881 'include_dirs': [ 3881 # '../webkit/webkit.gyp:webkit_resources',
3882 '..', 3882 # ],
3883 'third_party/wtl/include', 3883 # 'include_dirs': [
3884 ], 3884 # '..',
3885 'sources': [ 3885 # 'third_party/wtl/include',
3886 '../webkit/glue/resources/aliasb.cur', 3886 # ],
3887 '../webkit/glue/resources/cell.cur', 3887 # 'sources': [
3888 '../webkit/glue/resources/col_resize.cur', 3888 # '../webkit/glue/resources/aliasb.cur',
3889 '../webkit/glue/resources/copy.cur', 3889 # '../webkit/glue/resources/cell.cur',
3890 '../webkit/glue/resources/row_resize.cur', 3890 # '../webkit/glue/resources/col_resize.cur',
3891 '../webkit/glue/resources/vertical_text.cur', 3891 # '../webkit/glue/resources/copy.cur',
3892 '../webkit/glue/resources/zoom_in.cur', 3892 # '../webkit/glue/resources/row_resize.cur',
3893 '../webkit/glue/resources/zoom_out.cur', 3893 # '../webkit/glue/resources/vertical_text.cur',
3894 'app/chrome_dll.rc', 3894 # '../webkit/glue/resources/zoom_in.cur',
3895 'app/chrome_dll_resource.h', 3895 # '../webkit/glue/resources/zoom_out.cur',
3896 'app/chrome_dll_version.rc.version', 3896 # 'app/chrome_dll.rc',
3897 'browser/child_process_security_policy_browser_test.cc', 3897 # 'app/chrome_dll_resource.h',
3898 'browser/renderer_host/web_cache_manager_browser_test.cc', 3898 # 'app/chrome_dll_version.rc.version',
3899 'browser/ssl/ssl_browser_tests.cc', 3899 # 'browser/child_process_security_policy_browser_test.cc',
3900 'browser/task_manager_browsertest.cc', 3900 # 'browser/renderer_host/web_cache_manager_browser_test.cc',
3901 'browser/views/find_bar_win_browsertest.cc', 3901 # 'browser/ssl/ssl_browser_tests.cc',
3902 'test/browser/run_all_unittests.cc', 3902 # 'browser/task_manager_browsertest.cc',
3903 'test/data/resource.h', 3903 # 'browser/views/find_bar_win_browsertest.cc',
3904 'test/data/resource.rc', 3904 # 'test/browser/run_all_unittests.cc',
3905 'test/in_process_browser_test.cc', 3905 # 'test/data/resource.h',
3906 'test/in_process_browser_test.h', 3906 # 'test/data/resource.rc',
3907 'test/ui_test_utils.cc', 3907 # 'test/in_process_browser_test.cc',
3908 'test/ui_test_utils.h', 3908 # 'test/in_process_browser_test.h',
3909 'test/unit/chrome_test_suite.h', 3909 # 'test/ui_test_utils.cc',
3910 'tools/build/win/precompiled_wtl.cc', 3910 # 'test/ui_test_utils.h',
3911 'tools/build/win/precompiled_wtl.h', 3911 # 'test/unit/chrome_test_suite.h',
3912 ], 3912 # 'tools/build/win/precompiled_wtl.cc',
3913 'configurations': { 3913 # 'tools/build/win/precompiled_wtl.h',
3914 'Debug': { 3914 # ],
3915 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', 3915 # 'configurations': {
3916 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', 3916 # 'Debug': {
3917 }, 3917 # 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
3918 }, 3918 # 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
3919 }, 3919 # },
3920 # },
3921 #},
3920 { 3922 {
3921 'target_name': 'convert_dict', 3923 'target_name': 'convert_dict',
3922 'type': 'executable', 3924 'type': 'executable',
3923 'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF', 3925 'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
3924 'msvs_existing_vcproj': 'tools/convert_dict/convert_dict.vcproj', 3926 'msvs_existing_vcproj': 'tools/convert_dict/convert_dict.vcproj',
3925 'dependencies': [ 3927 'dependencies': [
3926 '../base/base.gyp:base', 3928 '../base/base.gyp:base',
3927 ], 3929 ],
3928 'include_dirs': [ 3930 'include_dirs': [
3929 '..', 3931 '..',
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
4339 # Use outputs of this action as inputs for the main target build. 4341 # Use outputs of this action as inputs for the main target build.
4340 # Seems as a misnomer but makes this happy on Linux (scons). 4342 # Seems as a misnomer but makes this happy on Linux (scons).
4341 'process_outputs_as_sources': 1, 4343 'process_outputs_as_sources': 1,
4342 }, 4344 },
4343 ], # 'actions' 4345 ], # 'actions'
4344 }, 4346 },
4345 ] 4347 ]
4346 }], 4348 }],
4347 ], # 'conditions' 4349 ], # 'conditions'
4348 } 4350 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698