| 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 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'version_py_path': 'tools/build/version.py', | 10 'version_py_path': 'tools/build/version.py', |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 'browser', | 26 'browser', |
| 27 'debugger', | 27 'debugger', |
| 28 'renderer', | 28 'renderer', |
| 29 'syncapi', | 29 'syncapi', |
| 30 'utility', | 30 'utility', |
| 31 'profile_import', | 31 'profile_import', |
| 32 'worker', | 32 'worker', |
| 33 '../printing/printing.gyp:printing', | 33 '../printing/printing.gyp:printing', |
| 34 '../webkit/webkit.gyp:inspector_resources', | 34 '../webkit/webkit.gyp:inspector_resources', |
| 35 ], | 35 ], |
| 36 'allocator_target': '../base/allocator/allocator.gyp:allocator', |
| 36 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 37 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 37 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', | 38 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', |
| 38 'chrome_strings_grds': [ | 39 'chrome_strings_grds': [ |
| 39 # Localizable resources. | 40 # Localizable resources. |
| 40 'app/resources/locale_settings.grd', | 41 'app/resources/locale_settings.grd', |
| 41 'app/chromium_strings.grd', | 42 'app/chromium_strings.grd', |
| 42 'app/generated_resources.grd', | 43 'app/generated_resources.grd', |
| 43 'app/google_chrome_strings.grd', | 44 'app/google_chrome_strings.grd', |
| 44 ], | 45 ], |
| 45 'chrome_resources_grds': [ | 46 'chrome_resources_grds': [ |
| (...skipping 2672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2718 '_CRT_SECURE_NO_DEPRECATE', | 2719 '_CRT_SECURE_NO_DEPRECATE', |
| 2719 '_SCL_SECURE_NO_DEPRECATE', | 2720 '_SCL_SECURE_NO_DEPRECATE', |
| 2720 ], | 2721 ], |
| 2721 'include_dirs': [ | 2722 'include_dirs': [ |
| 2722 'third_party/wtl/include', | 2723 'third_party/wtl/include', |
| 2723 ], | 2724 ], |
| 2724 'dependencies': [ | 2725 'dependencies': [ |
| 2725 '../gears/gears.gyp:gears', | 2726 '../gears/gears.gyp:gears', |
| 2726 '../google_update/google_update.gyp:google_update', | 2727 '../google_update/google_update.gyp:google_update', |
| 2727 '../third_party/cld/cld.gyp:cld', | 2728 '../third_party/cld/cld.gyp:cld', |
| 2728 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | |
| 2729 '../views/views.gyp:views', | 2729 '../views/views.gyp:views', |
| 2730 'installer/installer.gyp:installer_util', | 2730 'installer/installer.gyp:installer_util', |
| 2731 '<(allocator_target)', |
| 2731 ], | 2732 ], |
| 2732 'export_dependent_settings': [ | 2733 'export_dependent_settings': [ |
| 2733 '../views/views.gyp:views', | 2734 '../views/views.gyp:views', |
| 2734 ], | 2735 ], |
| 2735 'sources': [ | 2736 'sources': [ |
| 2736 'browser/net/ssl_config_service_manager_system.cc', | 2737 'browser/net/ssl_config_service_manager_system.cc', |
| 2737 # Using built-in rule in vstudio for midl. | 2738 # Using built-in rule in vstudio for midl. |
| 2738 'browser/history/history_indexer.idl', | 2739 'browser/history/history_indexer.idl', |
| 2739 ], | 2740 ], |
| 2740 'sources!': [ | 2741 'sources!': [ |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3405 '../build/linux/system.gyp:gtk', | 3406 '../build/linux/system.gyp:gtk', |
| 3406 '../sandbox/sandbox.gyp:sandbox', | 3407 '../sandbox/sandbox.gyp:sandbox', |
| 3407 ], | 3408 ], |
| 3408 }], | 3409 }], |
| 3409 # Windows-specific rules. | 3410 # Windows-specific rules. |
| 3410 ['OS=="win"', { | 3411 ['OS=="win"', { |
| 3411 'include_dirs': [ | 3412 'include_dirs': [ |
| 3412 'third_party/wtl/include', | 3413 'third_party/wtl/include', |
| 3413 ], | 3414 ], |
| 3414 'dependencies': [ | 3415 'dependencies': [ |
| 3415 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 3416 '<(allocator_target)', |
| 3416 ], | 3417 ], |
| 3417 'export_dependent_settings': [ | 3418 'export_dependent_settings': [ |
| 3418 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 3419 '<(allocator_target)', |
| 3419 ], | 3420 ], |
| 3420 },], | 3421 },], |
| 3421 ], | 3422 ], |
| 3422 }, | 3423 }, |
| 3423 { | 3424 { |
| 3424 'target_name': 'utility', | 3425 'target_name': 'utility', |
| 3425 'type': '<(library)', | 3426 'type': '<(library)', |
| 3426 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', | 3427 'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7', |
| 3427 'dependencies': [ | 3428 'dependencies': [ |
| 3428 '../base/base.gyp:base', | 3429 '../base/base.gyp:base', |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3557 '-e', 's/@@NAME@@/<(name)/', | 3558 '-e', 's/@@NAME@@/<(name)/', |
| 3558 '-e', 's/@@FILENAME@@/<(filename)/', | 3559 '-e', 's/@@FILENAME@@/<(filename)/', |
| 3559 '-e', 's/@@CONFDIR@@/<(confdir)/', | 3560 '-e', 's/@@CONFDIR@@/<(confdir)/', |
| 3560 ], | 3561 ], |
| 3561 'message': 'Generating manpage' | 3562 'message': 'Generating manpage' |
| 3562 }, | 3563 }, |
| 3563 ], | 3564 ], |
| 3564 'conditions': [ | 3565 'conditions': [ |
| 3565 [ 'linux_use_tcmalloc==1', { | 3566 [ 'linux_use_tcmalloc==1', { |
| 3566 'dependencies': [ | 3567 'dependencies': [ |
| 3567 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 3568 '<(allocator_target)', |
| 3568 ], | 3569 ], |
| 3569 }, | 3570 }, |
| 3570 ], | 3571 ], |
| 3571 ], | 3572 ], |
| 3572 'dependencies': [ | 3573 'dependencies': [ |
| 3573 # On Linux, link the dependencies (libraries) that make up actual | 3574 # On Linux, link the dependencies (libraries) that make up actual |
| 3574 # Chromium functionality directly into the executable. | 3575 # Chromium functionality directly into the executable. |
| 3575 '<@(chromium_dependencies)', | 3576 '<@(chromium_dependencies)', |
| 3576 # Needed for chrome_dll_main.cc #include of gtk/gtk.h | 3577 # Needed for chrome_dll_main.cc #include of gtk/gtk.h |
| 3577 '../build/linux/system.gyp:gtk', | 3578 '../build/linux/system.gyp:gtk', |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4202 ['OS=="linux"', { | 4203 ['OS=="linux"', { |
| 4203 'dependencies': [ | 4204 'dependencies': [ |
| 4204 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 4205 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 4205 ], | 4206 ], |
| 4206 }], | 4207 }], |
| 4207 ['OS=="win"', { | 4208 ['OS=="win"', { |
| 4208 'include_dirs': [ | 4209 'include_dirs': [ |
| 4209 'third_party/wtl/include', | 4210 'third_party/wtl/include', |
| 4210 ], | 4211 ], |
| 4211 'dependencies': [ | 4212 'dependencies': [ |
| 4212 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 4213 '<(allocator_target)', |
| 4213 ], | 4214 ], |
| 4214 }], | 4215 }], |
| 4215 ], | 4216 ], |
| 4216 }, | 4217 }, |
| 4217 { | 4218 { |
| 4218 'target_name': 'ui_tests', | 4219 'target_name': 'ui_tests', |
| 4219 'type': 'executable', | 4220 'type': 'executable', |
| 4220 'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE', | 4221 'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE', |
| 4221 'dependencies': [ | 4222 'dependencies': [ |
| 4222 'chrome', | 4223 'chrome', |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4332 'third_party/wtl/include', | 4333 'third_party/wtl/include', |
| 4333 ], | 4334 ], |
| 4334 'dependencies': [ | 4335 'dependencies': [ |
| 4335 'crash_service', # run time dependency | 4336 'crash_service', # run time dependency |
| 4336 'security_tests', # run time dependency | 4337 'security_tests', # run time dependency |
| 4337 'test_support_common', | 4338 'test_support_common', |
| 4338 '../google_update/google_update.gyp:google_update', | 4339 '../google_update/google_update.gyp:google_update', |
| 4339 '../views/views.gyp:views', | 4340 '../views/views.gyp:views', |
| 4340 # run time dependency | 4341 # run time dependency |
| 4341 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', | 4342 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', |
| 4342 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 4343 '<(allocator_target)', |
| 4343 ], | 4344 ], |
| 4344 'link_settings': { | 4345 'link_settings': { |
| 4345 'libraries': [ | 4346 'libraries': [ |
| 4346 '-lOleAcc.lib', | 4347 '-lOleAcc.lib', |
| 4347 ], | 4348 ], |
| 4348 }, | 4349 }, |
| 4349 'configurations': { | 4350 'configurations': { |
| 4350 'Debug': { | 4351 'Debug': { |
| 4351 'msvs_settings': { | 4352 'msvs_settings': { |
| 4352 'VCLinkerTool': { | 4353 'VCLinkerTool': { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4403 # to enable it on other platforms. | 4404 # to enable it on other platforms. |
| 4404 ['OS=="win"', { | 4405 ['OS=="win"', { |
| 4405 'dependencies': [ | 4406 'dependencies': [ |
| 4406 'crash_service', # run time dependency | 4407 'crash_service', # run time dependency |
| 4407 'security_tests', # run time dependency | 4408 'security_tests', # run time dependency |
| 4408 'test_support_common', | 4409 'test_support_common', |
| 4409 '../google_update/google_update.gyp:google_update', | 4410 '../google_update/google_update.gyp:google_update', |
| 4410 '../views/views.gyp:views', | 4411 '../views/views.gyp:views', |
| 4411 # run time dependency | 4412 # run time dependency |
| 4412 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', | 4413 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', |
| 4413 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 4414 '<(allocator_target)', |
| 4414 ], | 4415 ], |
| 4415 'link_settings': { | 4416 'link_settings': { |
| 4416 'libraries': [ | 4417 'libraries': [ |
| 4417 '-lOleAcc.lib', | 4418 '-lOleAcc.lib', |
| 4418 ], | 4419 ], |
| 4419 }, | 4420 }, |
| 4420 'configurations': { | 4421 'configurations': { |
| 4421 'Debug': { | 4422 'Debug': { |
| 4422 'msvs_settings': { | 4423 'msvs_settings': { |
| 4423 'VCLinkerTool': { | 4424 'VCLinkerTool': { |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4904 'defines': [ | 4905 'defines': [ |
| 4905 '__STD_C', | 4906 '__STD_C', |
| 4906 '_CRT_SECURE_NO_DEPRECATE', | 4907 '_CRT_SECURE_NO_DEPRECATE', |
| 4907 '_SCL_SECURE_NO_DEPRECATE', | 4908 '_SCL_SECURE_NO_DEPRECATE', |
| 4908 ], | 4909 ], |
| 4909 'dependencies': [ | 4910 'dependencies': [ |
| 4910 'chrome_dll_version', | 4911 'chrome_dll_version', |
| 4911 'installer/installer.gyp:installer_util_strings', | 4912 'installer/installer.gyp:installer_util_strings', |
| 4912 '../views/views.gyp:views', | 4913 '../views/views.gyp:views', |
| 4913 'test_chrome_plugin', # run time dependency | 4914 'test_chrome_plugin', # run time dependency |
| 4914 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 4915 '<(allocator_target)', |
| 4915 ], | 4916 ], |
| 4916 'include_dirs': [ | 4917 'include_dirs': [ |
| 4917 'third_party/wtl/include', | 4918 'third_party/wtl/include', |
| 4918 ], | 4919 ], |
| 4919 'sources': [ | 4920 'sources': [ |
| 4920 'app/chrome_dll.rc', | 4921 'app/chrome_dll.rc', |
| 4921 'test/data/resource.rc', | 4922 'test/data/resource.rc', |
| 4922 | 4923 |
| 4923 '<@(views_unit_tests_sources)', | 4924 '<@(views_unit_tests_sources)', |
| 4924 '<@(views_unit_tests_sources_win_specific)', | 4925 '<@(views_unit_tests_sources_win_specific)', |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5033 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 5034 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 5034 '<@(browser_tests_sources_win_specific)', | 5035 '<@(browser_tests_sources_win_specific)', |
| 5035 '<@(browser_tests_sources_views_specific)' | 5036 '<@(browser_tests_sources_views_specific)' |
| 5036 ], | 5037 ], |
| 5037 'include_dirs': [ | 5038 'include_dirs': [ |
| 5038 'third_party/wtl/include', | 5039 'third_party/wtl/include', |
| 5039 ], | 5040 ], |
| 5040 'dependencies': [ | 5041 'dependencies': [ |
| 5041 'chrome_dll_version', | 5042 'chrome_dll_version', |
| 5042 'installer/installer.gyp:installer_util_strings', | 5043 'installer/installer.gyp:installer_util_strings', |
| 5043 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5044 '<(allocator_target)', |
| 5044 ], | 5045 ], |
| 5045 'configurations': { | 5046 'configurations': { |
| 5046 'Debug': { | 5047 'Debug': { |
| 5047 'msvs_settings': { | 5048 'msvs_settings': { |
| 5048 'VCLinkerTool': { | 5049 'VCLinkerTool': { |
| 5049 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 5050 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 5050 }, | 5051 }, |
| 5051 }, | 5052 }, |
| 5052 }, | 5053 }, |
| 5053 } | 5054 } |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5122 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 5123 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 5123 ], | 5124 ], |
| 5124 }], | 5125 }], |
| 5125 ['OS=="linux" and toolkit_views==1', { | 5126 ['OS=="linux" and toolkit_views==1', { |
| 5126 'dependencies': [ | 5127 'dependencies': [ |
| 5127 '../views/views.gyp:views', | 5128 '../views/views.gyp:views', |
| 5128 ], | 5129 ], |
| 5129 }], | 5130 }], |
| 5130 ['OS=="win"', { | 5131 ['OS=="win"', { |
| 5131 'dependencies': [ | 5132 'dependencies': [ |
| 5132 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5133 '<(allocator_target)', |
| 5133 ], | 5134 ], |
| 5134 },], | 5135 },], |
| 5135 ], | 5136 ], |
| 5136 }, | 5137 }, |
| 5137 { | 5138 { |
| 5138 # To run the tests from page_load_test.cc on Linux, we need to: | 5139 # To run the tests from page_load_test.cc on Linux, we need to: |
| 5139 # | 5140 # |
| 5140 # a) Build with Breakpad (GYP_DEFINES="linux_chromium_breakpad=1") | 5141 # a) Build with Breakpad (GYP_DEFINES="linux_chromium_breakpad=1") |
| 5141 # b) Run with CHROME_HEADLESS=1 to generate crash dumps. | 5142 # b) Run with CHROME_HEADLESS=1 to generate crash dumps. |
| 5142 # c) Strip the binary if it's a debug build. (binary may be over 2GB) | 5143 # c) Strip the binary if it's a debug build. (binary may be over 2GB) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 5157 ], | 5158 ], |
| 5158 'sources': [ | 5159 'sources': [ |
| 5159 'test/reliability/page_load_test.cc', | 5160 'test/reliability/page_load_test.cc', |
| 5160 'test/reliability/page_load_test.h', | 5161 'test/reliability/page_load_test.h', |
| 5161 'test/reliability/reliability_test_suite.h', | 5162 'test/reliability/reliability_test_suite.h', |
| 5162 'test/reliability/run_all_unittests.cc', | 5163 'test/reliability/run_all_unittests.cc', |
| 5163 ], | 5164 ], |
| 5164 'conditions': [ | 5165 'conditions': [ |
| 5165 ['OS=="win"', { | 5166 ['OS=="win"', { |
| 5166 'dependencies': [ | 5167 'dependencies': [ |
| 5167 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5168 '<(allocator_target)', |
| 5168 ], | 5169 ], |
| 5169 },], | 5170 },], |
| 5170 ['OS=="linux"', { | 5171 ['OS=="linux"', { |
| 5171 'dependencies': [ | 5172 'dependencies': [ |
| 5172 '../build/linux/system.gyp:gtk', | 5173 '../build/linux/system.gyp:gtk', |
| 5173 ], | 5174 ], |
| 5174 },], | 5175 },], |
| 5175 ], | 5176 ], |
| 5176 }, | 5177 }, |
| 5177 { | 5178 { |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5261 ], | 5262 ], |
| 5262 'conditions': [ | 5263 'conditions': [ |
| 5263 ['OS=="linux"', { | 5264 ['OS=="linux"', { |
| 5264 'dependencies': [ | 5265 'dependencies': [ |
| 5265 '../build/linux/system.gyp:gtk', | 5266 '../build/linux/system.gyp:gtk', |
| 5266 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 5267 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 5267 ], | 5268 ], |
| 5268 }], | 5269 }], |
| 5269 ['OS=="win"', { | 5270 ['OS=="win"', { |
| 5270 'dependencies': [ | 5271 'dependencies': [ |
| 5271 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5272 '<(allocator_target)', |
| 5272 ], | 5273 ], |
| 5273 },], | 5274 },], |
| 5274 ], | 5275 ], |
| 5275 }, | 5276 }, |
| 5276 { | 5277 { |
| 5277 'target_name': 'memory_test', | 5278 'target_name': 'memory_test', |
| 5278 'type': 'executable', | 5279 'type': 'executable', |
| 5279 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE', | 5280 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE', |
| 5280 'dependencies': [ | 5281 'dependencies': [ |
| 5281 'chrome', | 5282 'chrome', |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5322 ], | 5323 ], |
| 5323 'sources': [ | 5324 'sources': [ |
| 5324 'test/url_fetch_test/url_fetch_test.cc', | 5325 'test/url_fetch_test/url_fetch_test.cc', |
| 5325 ], | 5326 ], |
| 5326 'conditions': [ | 5327 'conditions': [ |
| 5327 ['OS=="win"', { | 5328 ['OS=="win"', { |
| 5328 'include_dirs': [ | 5329 'include_dirs': [ |
| 5329 'third_party/wtl/include', | 5330 'third_party/wtl/include', |
| 5330 ], | 5331 ], |
| 5331 'dependencies': [ | 5332 'dependencies': [ |
| 5332 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5333 '<(allocator_target)', |
| 5333 ], | 5334 ], |
| 5334 }], # OS="win" | 5335 }], # OS="win" |
| 5335 ], # conditions | 5336 ], # conditions |
| 5336 }, | 5337 }, |
| 5337 { | 5338 { |
| 5338 # Protobuf compiler / generate rule for sync.proto | 5339 # Protobuf compiler / generate rule for sync.proto |
| 5339 'target_name': 'sync_proto', | 5340 'target_name': 'sync_proto', |
| 5340 'type': 'none', | 5341 'type': 'none', |
| 5341 'actions': [ | 5342 'actions': [ |
| 5342 { | 5343 { |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5523 'syncapi', | 5524 'syncapi', |
| 5524 'sync_proto', | 5525 'sync_proto', |
| 5525 'test_support_unit', | 5526 'test_support_unit', |
| 5526 ], | 5527 ], |
| 5527 'conditions': [ | 5528 'conditions': [ |
| 5528 ['OS=="win"', { | 5529 ['OS=="win"', { |
| 5529 'sources' : [ | 5530 'sources' : [ |
| 5530 'browser/sync/util/data_encryption_unittest.cc', | 5531 'browser/sync/util/data_encryption_unittest.cc', |
| 5531 ], | 5532 ], |
| 5532 'dependencies': [ | 5533 'dependencies': [ |
| 5533 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 5534 '<(allocator_target)', |
| 5534 ], | 5535 ], |
| 5535 'link_settings': { | 5536 'link_settings': { |
| 5536 'libraries': [ | 5537 'libraries': [ |
| 5537 '-lcrypt32.lib', | 5538 '-lcrypt32.lib', |
| 5538 '-lws2_32.lib', | 5539 '-lws2_32.lib', |
| 5539 '-lsecur32.lib', | 5540 '-lsecur32.lib', |
| 5540 ], | 5541 ], |
| 5541 }, | 5542 }, |
| 5542 }, { # else: OS != "win" | 5543 }, { # else: OS != "win" |
| 5543 'sources!': [ | 5544 'sources!': [ |
| (...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6440 'configurations': { | 6441 'configurations': { |
| 6441 'Debug': { | 6442 'Debug': { |
| 6442 'msvs_settings': { | 6443 'msvs_settings': { |
| 6443 'VCLinkerTool': { | 6444 'VCLinkerTool': { |
| 6444 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 6445 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 6445 }, | 6446 }, |
| 6446 }, | 6447 }, |
| 6447 }, | 6448 }, |
| 6448 }, | 6449 }, |
| 6449 'dependencies': [ | 6450 'dependencies': [ |
| 6450 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 6451 '<(allocator_target)', |
| 6451 ], | 6452 ], |
| 6452 }], | 6453 }], |
| 6453 ], | 6454 ], |
| 6454 }, | 6455 }, |
| 6455 # TODO(port): enable on mac. | 6456 # TODO(port): enable on mac. |
| 6456 { | 6457 { |
| 6457 'includes': ['test/interactive_ui/interactive_ui_tests.gypi'] | 6458 'includes': ['test/interactive_ui/interactive_ui_tests.gypi'] |
| 6458 }, | 6459 }, |
| 6459 ], | 6460 ], |
| 6460 },], # OS!="mac" | 6461 },], # OS!="mac" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6503 { 'targets': [ | 6504 { 'targets': [ |
| 6504 { | 6505 { |
| 6505 # TODO(sgk): remove this when we change the buildbots to | 6506 # TODO(sgk): remove this when we change the buildbots to |
| 6506 # use the generated build\all.sln file to build the world. | 6507 # use the generated build\all.sln file to build the world. |
| 6507 'target_name': 'pull_in_all', | 6508 'target_name': 'pull_in_all', |
| 6508 'type': 'none', | 6509 'type': 'none', |
| 6509 'dependencies': [ | 6510 'dependencies': [ |
| 6510 'installer/mini_installer.gyp:*', | 6511 'installer/mini_installer.gyp:*', |
| 6511 'installer/installer.gyp:*', | 6512 'installer/installer.gyp:*', |
| 6512 '../app/app.gyp:*', | 6513 '../app/app.gyp:*', |
| 6514 '../base/allocator/allocator.gyp:*', |
| 6513 '../base/base.gyp:*', | 6515 '../base/base.gyp:*', |
| 6514 '../ipc/ipc.gyp:*', | 6516 '../ipc/ipc.gyp:*', |
| 6515 '../media/media.gyp:*', | 6517 '../media/media.gyp:*', |
| 6516 '../net/net.gyp:*', | 6518 '../net/net.gyp:*', |
| 6517 '../printing/printing.gyp:*', | 6519 '../printing/printing.gyp:*', |
| 6518 '../rlz/rlz.gyp:*', | 6520 '../rlz/rlz.gyp:*', |
| 6519 '../sdch/sdch.gyp:*', | 6521 '../sdch/sdch.gyp:*', |
| 6520 '../skia/skia.gyp:*', | 6522 '../skia/skia.gyp:*', |
| 6521 '../testing/gmock.gyp:*', | 6523 '../testing/gmock.gyp:*', |
| 6522 '../testing/gtest.gyp:*', | 6524 '../testing/gtest.gyp:*', |
| 6523 '../third_party/bsdiff/bsdiff.gyp:*', | 6525 '../third_party/bsdiff/bsdiff.gyp:*', |
| 6524 '../third_party/bspatch/bspatch.gyp:*', | 6526 '../third_party/bspatch/bspatch.gyp:*', |
| 6525 '../third_party/bzip2/bzip2.gyp:*', | 6527 '../third_party/bzip2/bzip2.gyp:*', |
| 6526 '../third_party/cld/cld.gyp:cld', | 6528 '../third_party/cld/cld.gyp:cld', |
| 6527 '../third_party/codesighs/codesighs.gyp:*', | 6529 '../third_party/codesighs/codesighs.gyp:*', |
| 6528 '../third_party/icu/icu.gyp:*', | 6530 '../third_party/icu/icu.gyp:*', |
| 6529 '../third_party/libjpeg/libjpeg.gyp:*', | 6531 '../third_party/libjpeg/libjpeg.gyp:*', |
| 6530 '../third_party/libpng/libpng.gyp:*', | 6532 '../third_party/libpng/libpng.gyp:*', |
| 6531 '../third_party/libxml/libxml.gyp:*', | 6533 '../third_party/libxml/libxml.gyp:*', |
| 6532 '../third_party/libxslt/libxslt.gyp:*', | 6534 '../third_party/libxslt/libxslt.gyp:*', |
| 6533 '../third_party/lzma_sdk/lzma_sdk.gyp:*', | 6535 '../third_party/lzma_sdk/lzma_sdk.gyp:*', |
| 6534 '../third_party/modp_b64/modp_b64.gyp:*', | 6536 '../third_party/modp_b64/modp_b64.gyp:*', |
| 6535 '../third_party/npapi/npapi.gyp:*', | 6537 '../third_party/npapi/npapi.gyp:*', |
| 6536 '../third_party/sqlite/sqlite.gyp:*', | 6538 '../third_party/sqlite/sqlite.gyp:*', |
| 6537 '../third_party/tcmalloc/tcmalloc.gyp:*', | |
| 6538 '../third_party/zlib/zlib.gyp:*', | 6539 '../third_party/zlib/zlib.gyp:*', |
| 6539 '../webkit/tools/test_shell/test_shell.gyp:*', | 6540 '../webkit/tools/test_shell/test_shell.gyp:*', |
| 6540 '../webkit/webkit.gyp:*', | 6541 '../webkit/webkit.gyp:*', |
| 6541 | 6542 |
| 6542 '../build/temp_gyp/googleurl.gyp:*', | 6543 '../build/temp_gyp/googleurl.gyp:*', |
| 6543 | 6544 |
| 6544 '../breakpad/breakpad.gyp:*', | 6545 '../breakpad/breakpad.gyp:*', |
| 6545 '../courgette/courgette.gyp:*', | 6546 '../courgette/courgette.gyp:*', |
| 6546 '../gears/gears.gyp:*', | 6547 '../gears/gears.gyp:*', |
| 6547 '../rlz/rlz.gyp:*', | 6548 '../rlz/rlz.gyp:*', |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6718 }], | 6719 }], |
| 6719 # Windows-specific rules. | 6720 # Windows-specific rules. |
| 6720 ['OS=="win"', { | 6721 ['OS=="win"', { |
| 6721 'include_dirs': [ | 6722 'include_dirs': [ |
| 6722 'third_party/wtl/include', | 6723 'third_party/wtl/include', |
| 6723 ], | 6724 ], |
| 6724 'dependencies': [ | 6725 'dependencies': [ |
| 6725 'chrome_dll_version', | 6726 'chrome_dll_version', |
| 6726 'installer/installer.gyp:installer_util_strings', | 6727 'installer/installer.gyp:installer_util_strings', |
| 6727 '../views/views.gyp:views', | 6728 '../views/views.gyp:views', |
| 6728 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 6729 '<(allocator_target)', |
| 6729 ], | 6730 ], |
| 6730 'configurations': { | 6731 'configurations': { |
| 6731 'Debug': { | 6732 'Debug': { |
| 6732 'msvs_settings': { | 6733 'msvs_settings': { |
| 6733 'VCLinkerTool': { | 6734 'VCLinkerTool': { |
| 6734 'LinkIncremental': '<(msvs_large_module_debug_link_mode)
', | 6735 'LinkIncremental': '<(msvs_large_module_debug_link_mode)
', |
| 6735 }, | 6736 }, |
| 6736 }, | 6737 }, |
| 6737 }, | 6738 }, |
| 6738 }, | 6739 }, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6778 'include_dirs': [ | 6779 'include_dirs': [ |
| 6779 '..', | 6780 '..', |
| 6780 ], | 6781 ], |
| 6781 'sources': [ | 6782 'sources': [ |
| 6782 'tools/profiles/generate_profile.cc', | 6783 'tools/profiles/generate_profile.cc', |
| 6783 'tools/profiles/thumbnail-inl.h', | 6784 'tools/profiles/thumbnail-inl.h', |
| 6784 ], | 6785 ], |
| 6785 'conditions': [ | 6786 'conditions': [ |
| 6786 ['OS=="win"', { | 6787 ['OS=="win"', { |
| 6787 'dependencies': [ | 6788 'dependencies': [ |
| 6788 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 6789 '<(allocator_target)', |
| 6789 ], | 6790 ], |
| 6790 'configurations': { | 6791 'configurations': { |
| 6791 'Debug': { | 6792 'Debug': { |
| 6792 'msvs_settings': { | 6793 'msvs_settings': { |
| 6793 'VCLinkerTool': { | 6794 'VCLinkerTool': { |
| 6794 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 6795 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 6795 }, | 6796 }, |
| 6796 }, | 6797 }, |
| 6797 }, | 6798 }, |
| 6798 }, | 6799 }, |
| (...skipping 19 matching lines...) Expand all Loading... |
| 6818 'include_dirs': [ | 6819 'include_dirs': [ |
| 6819 '..', | 6820 '..', |
| 6820 'third_party/wtl/include', | 6821 'third_party/wtl/include', |
| 6821 ], | 6822 ], |
| 6822 'sources': [ | 6823 'sources': [ |
| 6823 'test/plugin/plugin_test.cpp', | 6824 'test/plugin/plugin_test.cpp', |
| 6824 ], | 6825 ], |
| 6825 'conditions': [ | 6826 'conditions': [ |
| 6826 ['OS=="win"', { | 6827 ['OS=="win"', { |
| 6827 'dependencies': [ | 6828 'dependencies': [ |
| 6828 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 6829 '<(allocator_target)', |
| 6829 ], | 6830 ], |
| 6830 },], | 6831 },], |
| 6831 ], | 6832 ], |
| 6832 }, | 6833 }, |
| 6833 { | 6834 { |
| 6834 'target_name': 'security_tests', | 6835 'target_name': 'security_tests', |
| 6835 'type': 'shared_library', | 6836 'type': 'shared_library', |
| 6836 'msvs_guid': 'E750512D-FC7C-4C98-BF04-0A0DAF882055', | 6837 'msvs_guid': 'E750512D-FC7C-4C98-BF04-0A0DAF882055', |
| 6837 'include_dirs': [ | 6838 'include_dirs': [ |
| 6838 '..', | 6839 '..', |
| (...skipping 22 matching lines...) Expand all Loading... |
| 6861 'include_dirs': [ | 6862 'include_dirs': [ |
| 6862 '..', | 6863 '..', |
| 6863 'third_party/wtl/include', | 6864 'third_party/wtl/include', |
| 6864 ], | 6865 ], |
| 6865 'sources': [ | 6866 'sources': [ |
| 6866 'test/selenium/selenium_test.cc', | 6867 'test/selenium/selenium_test.cc', |
| 6867 ], | 6868 ], |
| 6868 'conditions': [ | 6869 'conditions': [ |
| 6869 ['OS=="win"', { | 6870 ['OS=="win"', { |
| 6870 'dependencies': [ | 6871 'dependencies': [ |
| 6871 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | 6872 '<(allocator_target)', |
| 6872 ], | 6873 ], |
| 6873 },], | 6874 },], |
| 6874 ], | 6875 ], |
| 6875 }, | 6876 }, |
| 6876 { | 6877 { |
| 6877 'target_name': 'test_chrome_plugin', | 6878 'target_name': 'test_chrome_plugin', |
| 6878 'type': 'shared_library', | 6879 'type': 'shared_library', |
| 6879 'msvs_guid': '7F0A70F6-BE3F-4C19-B435-956AB8F30BA4', | 6880 'msvs_guid': '7F0A70F6-BE3F-4C19-B435-956AB8F30BA4', |
| 6880 'dependencies': [ | 6881 'dependencies': [ |
| 6881 '../base/base.gyp:base', | 6882 '../base/base.gyp:base', |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6946 ] | 6947 ] |
| 6947 }], | 6948 }], |
| 6948 ], # 'conditions' | 6949 ], # 'conditions' |
| 6949 } | 6950 } |
| 6950 | 6951 |
| 6951 # Local Variables: | 6952 # Local Variables: |
| 6952 # tab-width:2 | 6953 # tab-width:2 |
| 6953 # indent-tabs-mode:nil | 6954 # indent-tabs-mode:nil |
| 6954 # End: | 6955 # End: |
| 6955 # vim: set expandtab tabstop=2 shiftwidth=2: | 6956 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |