| OLD | NEW |
| 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 4043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4054 '-lurlmon.lib', | 4054 '-lurlmon.lib', |
| 4055 '-lwinmm.lib', | 4055 '-lwinmm.lib', |
| 4056 ], | 4056 ], |
| 4057 }, | 4057 }, |
| 4058 'configurations': { | 4058 'configurations': { |
| 4059 'Debug': { | 4059 'Debug': { |
| 4060 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', | 4060 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', |
| 4061 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', | 4061 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', |
| 4062 'msvs_settings': { | 4062 'msvs_settings': { |
| 4063 'VCLinkerTool': { | 4063 'VCLinkerTool': { |
| 4064 'LinkIncremental': '1', # /INCREMENTAL:NO | 4064 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 4065 }, | 4065 }, |
| 4066 }, | 4066 }, |
| 4067 }, | 4067 }, |
| 4068 }, | 4068 }, |
| 4069 }, { # else: OS != "win" | 4069 }, { # else: OS != "win" |
| 4070 'sources!': [ | 4070 'sources!': [ |
| 4071 'browser/bookmarks/bookmark_codec_unittest.cc', | 4071 'browser/bookmarks/bookmark_codec_unittest.cc', |
| 4072 'browser/bookmarks/bookmark_drag_data_unittest.cc', | 4072 'browser/bookmarks/bookmark_drag_data_unittest.cc', |
| 4073 'browser/bookmarks/bookmark_folder_tree_model_unittest.cc', | 4073 'browser/bookmarks/bookmark_folder_tree_model_unittest.cc', |
| 4074 'browser/bookmarks/bookmark_table_model_unittest.cc', | 4074 'browser/bookmarks/bookmark_table_model_unittest.cc', |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4348 'SubSystem': '2', | 4348 'SubSystem': '2', |
| 4349 }, | 4349 }, |
| 4350 'VCManifestTool': { | 4350 'VCManifestTool': { |
| 4351 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man
ifest', | 4351 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man
ifest', |
| 4352 }, | 4352 }, |
| 4353 }, | 4353 }, |
| 4354 'configurations': { | 4354 'configurations': { |
| 4355 'Debug': { | 4355 'Debug': { |
| 4356 'msvs_settings': { | 4356 'msvs_settings': { |
| 4357 'VCLinkerTool': { | 4357 'VCLinkerTool': { |
| 4358 'LinkIncremental': '1', # /INCREMENTAL:NO | 4358 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 4359 }, | 4359 }, |
| 4360 }, | 4360 }, |
| 4361 }, | 4361 }, |
| 4362 }, | 4362 }, |
| 4363 }], # OS=="win" | 4363 }], # OS=="win" |
| 4364 ['OS=="mac"', { | 4364 ['OS=="mac"', { |
| 4365 # The main browser executable's name is <(mac_product_name). | 4365 # The main browser executable's name is <(mac_product_name). |
| 4366 # Certain things will get confused if two modules in the | 4366 # Certain things will get confused if two modules in the |
| 4367 # executable share the same name, so append " Framework" to the | 4367 # executable share the same name, so append " Framework" to the |
| 4368 # product_name used for the framework. This will result in | 4368 # product_name used for the framework. This will result in |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4588 # TODO(port): | 4588 # TODO(port): |
| 4589 'browser/safe_browsing/filter_false_positive_perftest.cc', | 4589 'browser/safe_browsing/filter_false_positive_perftest.cc', |
| 4590 'browser/visitedlink_perftest.cc', | 4590 'browser/visitedlink_perftest.cc', |
| 4591 ], | 4591 ], |
| 4592 }], | 4592 }], |
| 4593 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { | 4593 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { |
| 4594 'dependencies': [ | 4594 'dependencies': [ |
| 4595 '../views/views.gyp:views', | 4595 '../views/views.gyp:views', |
| 4596 ], | 4596 ], |
| 4597 }], | 4597 }], |
| 4598 ], | 4598 ['OS=="win"', { |
| 4599 'configurations': { | 4599 'configurations': { |
| 4600 'Debug': { | 4600 'Debug': { |
| 4601 'msvs_settings': { | 4601 'msvs_settings': { |
| 4602 'VCLinkerTool': { | 4602 'VCLinkerTool': { |
| 4603 'LinkIncremental': '1', # /INCREMENTAL:NO | 4603 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 4604 }, |
| 4605 }, |
| 4604 }, | 4606 }, |
| 4605 }, | 4607 }, |
| 4606 }, | 4608 }], |
| 4607 }, | 4609 ], |
| 4608 }, | 4610 }, |
| 4609 ], | 4611 ], |
| 4610 }], # OS!="mac" | 4612 }], # OS!="mac" |
| 4611 ['OS!="win"', | 4613 ['OS!="win"', |
| 4612 { 'targets': [ | 4614 { 'targets': [ |
| 4613 { | 4615 { |
| 4614 # Executable that runs each browser test in a new process. | 4616 # Executable that runs each browser test in a new process. |
| 4615 'target_name': 'browser_tests', | 4617 'target_name': 'browser_tests', |
| 4616 'type': 'executable', | 4618 'type': 'executable', |
| 4617 'dependencies': [ | 4619 'dependencies': [ |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4857 'test/automation/automation_proxy.cc', | 4859 'test/automation/automation_proxy.cc', |
| 4858 'test/automation/automation_proxy.h', | 4860 'test/automation/automation_proxy.h', |
| 4859 'test/automation/browser_proxy.cc', | 4861 'test/automation/browser_proxy.cc', |
| 4860 'test/automation/browser_proxy.h', | 4862 'test/automation/browser_proxy.h', |
| 4861 'test/automation/tab_proxy.cc', | 4863 'test/automation/tab_proxy.cc', |
| 4862 'test/automation/tab_proxy.h', | 4864 'test/automation/tab_proxy.h', |
| 4863 'test/automation/window_proxy.cc', | 4865 'test/automation/window_proxy.cc', |
| 4864 'test/automation/window_proxy.h', | 4866 'test/automation/window_proxy.h', |
| 4865 ], | 4867 ], |
| 4866 }, | 4868 }, |
| 4867 » { | 4869 { |
| 4868 # Windows-only for now; this has issues with scons | 4870 # Windows-only for now; this has issues with scons |
| 4869 # regarding use of run_all_unittests.cc. | 4871 # regarding use of run_all_unittests.cc. |
| 4870 # TODO(zork): add target to linux build. | 4872 # TODO(zork): add target to linux build. |
| 4871 'target_name': 'live_sync_tests', | 4873 'target_name': 'live_sync_tests', |
| 4872 'type': 'executable', | 4874 'type': 'executable', |
| 4873 'dependencies': [ | 4875 'dependencies': [ |
| 4874 'browser', | 4876 'browser', |
| 4875 'chrome', | 4877 'chrome', |
| 4876 'chrome_resources', | 4878 'chrome_resources', |
| 4877 'common', | 4879 'common', |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4940 'include_dirs': [ | 4942 'include_dirs': [ |
| 4941 'third_party/wtl/include', | 4943 'third_party/wtl/include', |
| 4942 ], | 4944 ], |
| 4943 'dependencies': [ | 4945 'dependencies': [ |
| 4944 'chrome_dll_version', | 4946 'chrome_dll_version', |
| 4945 'installer/installer.gyp:installer_util_strings', | 4947 'installer/installer.gyp:installer_util_strings', |
| 4946 '../views/views.gyp:views', | 4948 '../views/views.gyp:views', |
| 4947 ], | 4949 ], |
| 4948 }], | 4950 }], |
| 4949 ], | 4951 ], |
| 4950 » }, | 4952 }, |
| 4951 { | 4953 { |
| 4952 # Shared library used by the in-proc browser tests. | 4954 # Shared library used by the in-proc browser tests. |
| 4953 'target_name': 'browser_tests_dll', | 4955 'target_name': 'browser_tests_dll', |
| 4954 'type': 'shared_library', | 4956 'type': 'shared_library', |
| 4955 'product_name': 'browser_tests', | 4957 'product_name': 'browser_tests', |
| 4956 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F', | 4958 'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F', |
| 4957 'dependencies': [ | 4959 'dependencies': [ |
| 4958 'chrome', | 4960 'chrome', |
| 4959 'browser', | 4961 'browser', |
| 4960 'chrome_dll_version', | 4962 'chrome_dll_version', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 4971 'include_dirs': [ | 4973 'include_dirs': [ |
| 4972 '..', | 4974 '..', |
| 4973 'third_party/wtl/include', | 4975 'third_party/wtl/include', |
| 4974 ], | 4976 ], |
| 4975 'configurations': { | 4977 'configurations': { |
| 4976 'Debug': { | 4978 'Debug': { |
| 4977 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', | 4979 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', |
| 4978 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', | 4980 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', |
| 4979 'msvs_settings': { | 4981 'msvs_settings': { |
| 4980 'VCLinkerTool': { | 4982 'VCLinkerTool': { |
| 4981 'LinkIncremental': '1', # /INCREMENTAL:NO | 4983 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 4982 }, | 4984 }, |
| 4983 }, | 4985 }, |
| 4984 }, | 4986 }, |
| 4985 }, | 4987 }, |
| 4986 'sources': [ | 4988 'sources': [ |
| 4987 'test/browser/run_all_unittests.cc', | 4989 'test/browser/run_all_unittests.cc', |
| 4988 'test/in_process_browser_test.cc', | 4990 'test/in_process_browser_test.cc', |
| 4989 'test/in_process_browser_test.h', | 4991 'test/in_process_browser_test.h', |
| 4990 'test/unit/chrome_test_suite.h', | 4992 'test/unit/chrome_test_suite.h', |
| 4991 'test/ui_test_utils.cc', | 4993 'test/ui_test_utils.cc', |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5140 | 5142 |
| 5141 'tools/build/win/precompiled_wtl.h', | 5143 'tools/build/win/precompiled_wtl.h', |
| 5142 'tools/build/win/precompiled_wtl.cc', | 5144 'tools/build/win/precompiled_wtl.cc', |
| 5143 ], | 5145 ], |
| 5144 'configurations': { | 5146 'configurations': { |
| 5145 'Debug': { | 5147 'Debug': { |
| 5146 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', | 5148 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', |
| 5147 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', | 5149 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', |
| 5148 'msvs_settings': { | 5150 'msvs_settings': { |
| 5149 'VCLinkerTool': { | 5151 'VCLinkerTool': { |
| 5150 'LinkIncremental': '1', # /INCREMENTAL:NO | 5152 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 5151 }, | 5153 }, |
| 5152 }, | 5154 }, |
| 5153 }, | 5155 }, |
| 5154 }, | 5156 }, |
| 5155 }, | 5157 }, |
| 5156 { | 5158 { |
| 5157 'target_name': 'plugin_tests', | 5159 'target_name': 'plugin_tests', |
| 5158 'type': 'executable', | 5160 'type': 'executable', |
| 5159 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', | 5161 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', |
| 5160 'dependencies': [ | 5162 'dependencies': [ |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5289 'VCLinkerTool': { | 5291 'VCLinkerTool': { |
| 5290 'BaseAddress': '0x3CE00000', | 5292 'BaseAddress': '0x3CE00000', |
| 5291 'OutputFile': '<(PRODUCT_DIR)/themes/default.dll', | 5293 'OutputFile': '<(PRODUCT_DIR)/themes/default.dll', |
| 5292 'ResourceOnlyDLL': 'true', | 5294 'ResourceOnlyDLL': 'true', |
| 5293 }, | 5295 }, |
| 5294 }, | 5296 }, |
| 5295 'configurations': { | 5297 'configurations': { |
| 5296 'Debug': { | 5298 'Debug': { |
| 5297 'msvs_settings': { | 5299 'msvs_settings': { |
| 5298 'VCLinkerTool': { | 5300 'VCLinkerTool': { |
| 5299 'LinkIncremental': '1', # /INCREMENTAL:NO | 5301 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 5300 }, | 5302 }, |
| 5301 }, | 5303 }, |
| 5302 }, | 5304 }, |
| 5303 }, | 5305 }, |
| 5304 }, | 5306 }, |
| 5305 ]}, # 'targets' | 5307 ]}, # 'targets' |
| 5306 ], # OS=="win" | 5308 ], # OS=="win" |
| 5307 # TODO(jrg): add in Windows code coverage targets. | 5309 # TODO(jrg): add in Windows code coverage targets. |
| 5308 ['coverage!=0', | 5310 ['coverage!=0', |
| 5309 { 'targets': [ | 5311 { 'targets': [ |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5344 # Use outputs of this action as inputs for the main target build. | 5346 # Use outputs of this action as inputs for the main target build. |
| 5345 # Seems as a misnomer but makes this happy on Linux (scons). | 5347 # Seems as a misnomer but makes this happy on Linux (scons). |
| 5346 'process_outputs_as_sources': 1, | 5348 'process_outputs_as_sources': 1, |
| 5347 }, | 5349 }, |
| 5348 ], # 'actions' | 5350 ], # 'actions' |
| 5349 }, | 5351 }, |
| 5350 ] | 5352 ] |
| 5351 }], | 5353 }], |
| 5352 ], # 'conditions' | 5354 ], # 'conditions' |
| 5353 } | 5355 } |
| OLD | NEW |