diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 629321c..ae0c726 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3702,6 +3702,9 @@ 'include_dirs': [ 'third_party/wtl/include', ], + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], }], ], }, @@ -3820,6 +3823,7 @@ '../views/views.gyp:views', # run time dependency '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', ], 'link_settings': { 'libraries': [ @@ -4253,6 +4257,7 @@ 'installer/installer.gyp:installer_util_strings', '../views/views.gyp:views', 'test_chrome_plugin', # run time dependency + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', ], 'include_dirs': [ 'third_party/wtl/include', @@ -4360,6 +4365,11 @@ '../views/views.gyp:views', ], }], + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], ], }, { @@ -4501,6 +4511,11 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], ], }, { @@ -4555,6 +4570,9 @@ 'include_dirs': [ 'third_party/wtl/include', ], + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], }], # OS="win" ], # conditions }, @@ -5058,6 +5076,13 @@ 'sources': [ 'tools/pbl_tool/pbl_tool.cc', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { 'target_name': 'perf_tests', @@ -5112,6 +5137,9 @@ }, }, }, + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], }], ], }, @@ -5205,6 +5233,7 @@ 'crash_service', # run time dependency 'installer/installer.gyp:installer_util_strings', '../views/views.gyp:views', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', ], 'sources': [ '../webkit/glue/resources/aliasb.cur', @@ -5551,6 +5580,7 @@ 'chrome_dll_version', 'installer/installer.gyp:installer_util_strings', '../views/views.gyp:views', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', ], }], ], @@ -5607,6 +5637,13 @@ '<@(browser_tests_sources)', '<@(browser_tests_sources_win_specific)', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { # Executable that runs the browser tests in-process. @@ -5675,6 +5712,13 @@ 'tools/profiles/generate_profile.cc', 'tools/profiles/thumbnail-inl.h', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { 'target_name': 'plugin_tests', @@ -5699,6 +5743,13 @@ 'sources': [ 'test/plugin/plugin_test.cpp', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { 'target_name': 'reliability_tests', @@ -5720,6 +5771,13 @@ 'test/reliability/reliability_test_suite.h', 'test/reliability/run_all_unittests.cc', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { 'target_name': 'security_tests', @@ -5756,6 +5814,13 @@ 'sources': [ 'test/selenium/selenium_test.cc', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + },], + ], }, { 'target_name': 'test_chrome_plugin', |