| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 17402)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -3842,82 +3842,84 @@
|
| 'test/automation/window_proxy.h',
|
| ],
|
| },
|
| + # TODO(sgk,bradnelson): re-enable once problems with
|
| + # LNK1104 errors for browser_tests.{ilk,pdb} have been fixed.
|
| + #{
|
| + # 'target_name': 'browser_tests',
|
| + # 'type': 'executable',
|
| + # 'msvs_guid': '9B87804D-2502-480B-95AE-5A572CE91809',
|
| + # 'msvs_existing_vcproj': 'test/browser/browser_tests_launcher.vcproj',
|
| + # 'dependencies': [
|
| + # 'installer/installer.gyp:installer_util',
|
| + # ],
|
| + # 'include_dirs': [
|
| + # '..',
|
| + # ],
|
| + # 'sources': [
|
| + # 'test/browser/browser_tests_launcher.cc',
|
| + # ],
|
| + #},
|
| + #{
|
| + # 'target_name': 'browser_tests_dll',
|
| + # 'type': 'shared_library',
|
| + # 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F',
|
| + # 'msvs_existing_vcproj': 'test/browser/browser_tests_dll.vcproj',
|
| + # 'product_name': 'browser_tests',
|
| + # 'dependencies': [
|
| + # 'browser',
|
| + # 'chrome_resources',
|
| + # 'debugger',
|
| + # 'renderer',
|
| + # 'installer/installer.gyp:installer_util_strings',
|
| + # '../base/base.gyp:base',
|
| + # '../base/base.gyp:base_gfx',
|
| + # '../net/net.gyp:net',
|
| + # '../net/net.gyp:net_resources',
|
| + # '../skia/skia.gyp:skia',
|
| + # '../testing/gtest.gyp:gtest',
|
| + # '../webkit/webkit.gyp:glue',
|
| + # '../webkit/webkit.gyp:webkit_resources',
|
| + # ],
|
| + # 'include_dirs': [
|
| + # '..',
|
| + # 'third_party/wtl/include',
|
| + # ],
|
| + # 'sources': [
|
| + # '../webkit/glue/resources/aliasb.cur',
|
| + # '../webkit/glue/resources/cell.cur',
|
| + # '../webkit/glue/resources/col_resize.cur',
|
| + # '../webkit/glue/resources/copy.cur',
|
| + # '../webkit/glue/resources/row_resize.cur',
|
| + # '../webkit/glue/resources/vertical_text.cur',
|
| + # '../webkit/glue/resources/zoom_in.cur',
|
| + # '../webkit/glue/resources/zoom_out.cur',
|
| + # 'app/chrome_dll.rc',
|
| + # 'app/chrome_dll_resource.h',
|
| + # 'app/chrome_dll_version.rc.version',
|
| + # 'browser/child_process_security_policy_browser_test.cc',
|
| + # 'browser/renderer_host/web_cache_manager_browser_test.cc',
|
| + # 'browser/ssl/ssl_browser_tests.cc',
|
| + # 'browser/task_manager_browsertest.cc',
|
| + # 'browser/views/find_bar_win_browsertest.cc',
|
| + # 'test/browser/run_all_unittests.cc',
|
| + # 'test/data/resource.h',
|
| + # 'test/data/resource.rc',
|
| + # 'test/in_process_browser_test.cc',
|
| + # 'test/in_process_browser_test.h',
|
| + # 'test/ui_test_utils.cc',
|
| + # 'test/ui_test_utils.h',
|
| + # 'test/unit/chrome_test_suite.h',
|
| + # 'tools/build/win/precompiled_wtl.cc',
|
| + # 'tools/build/win/precompiled_wtl.h',
|
| + # ],
|
| + # 'configurations': {
|
| + # 'Debug': {
|
| + # 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
|
| + # 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
|
| + # },
|
| + # },
|
| + #},
|
| {
|
| - 'target_name': 'browser_tests',
|
| - 'type': 'executable',
|
| - 'msvs_guid': '9B87804D-2502-480B-95AE-5A572CE91809',
|
| - 'msvs_existing_vcproj': 'test/browser/browser_tests_launcher.vcproj',
|
| - 'dependencies': [
|
| - 'installer/installer.gyp:installer_util',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - 'sources': [
|
| - 'test/browser/browser_tests_launcher.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'browser_tests_dll',
|
| - 'type': 'shared_library',
|
| - 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F',
|
| - 'msvs_existing_vcproj': 'test/browser/browser_tests_dll.vcproj',
|
| - 'product_name': 'browser_tests',
|
| - 'dependencies': [
|
| - 'browser',
|
| - 'chrome_resources',
|
| - 'debugger',
|
| - 'renderer',
|
| - 'installer/installer.gyp:installer_util_strings',
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_gfx',
|
| - '../net/net.gyp:net',
|
| - '../net/net.gyp:net_resources',
|
| - '../skia/skia.gyp:skia',
|
| - '../testing/gtest.gyp:gtest',
|
| - '../webkit/webkit.gyp:glue',
|
| - '../webkit/webkit.gyp:webkit_resources',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - 'third_party/wtl/include',
|
| - ],
|
| - 'sources': [
|
| - '../webkit/glue/resources/aliasb.cur',
|
| - '../webkit/glue/resources/cell.cur',
|
| - '../webkit/glue/resources/col_resize.cur',
|
| - '../webkit/glue/resources/copy.cur',
|
| - '../webkit/glue/resources/row_resize.cur',
|
| - '../webkit/glue/resources/vertical_text.cur',
|
| - '../webkit/glue/resources/zoom_in.cur',
|
| - '../webkit/glue/resources/zoom_out.cur',
|
| - 'app/chrome_dll.rc',
|
| - 'app/chrome_dll_resource.h',
|
| - 'app/chrome_dll_version.rc.version',
|
| - 'browser/child_process_security_policy_browser_test.cc',
|
| - 'browser/renderer_host/web_cache_manager_browser_test.cc',
|
| - 'browser/ssl/ssl_browser_tests.cc',
|
| - 'browser/task_manager_browsertest.cc',
|
| - 'browser/views/find_bar_win_browsertest.cc',
|
| - 'test/browser/run_all_unittests.cc',
|
| - 'test/data/resource.h',
|
| - 'test/data/resource.rc',
|
| - 'test/in_process_browser_test.cc',
|
| - 'test/in_process_browser_test.h',
|
| - 'test/ui_test_utils.cc',
|
| - 'test/ui_test_utils.h',
|
| - 'test/unit/chrome_test_suite.h',
|
| - 'tools/build/win/precompiled_wtl.cc',
|
| - 'tools/build/win/precompiled_wtl.h',
|
| - ],
|
| - 'configurations': {
|
| - 'Debug': {
|
| - 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
|
| - 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
|
| - },
|
| - },
|
| - },
|
| - {
|
| 'target_name': 'convert_dict',
|
| 'type': 'executable',
|
| 'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
|
|
|