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

Unified Diff: chrome/chrome.gyp

Issue 199041: Make ui_tests (and any renderer-based PE) use tcmalloc.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 25582)
+++ chrome/chrome.gyp (working copy)
@@ -3693,6 +3693,9 @@
'include_dirs': [
'third_party/wtl/include',
],
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
}],
],
},
@@ -3811,6 +3814,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': [
@@ -4244,6 +4248,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',
@@ -4351,6 +4356,11 @@
'../views/views.gyp:views',
],
}],
+ ['OS=="win"', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },],
],
},
{
@@ -4492,6 +4502,11 @@
'../build/linux/system.gyp:gtk',
],
}],
+ ['OS=="win"', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },],
],
},
{
@@ -4546,6 +4561,9 @@
'include_dirs': [
'third_party/wtl/include',
],
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
}], # OS="win"
], # conditions
},
@@ -5049,6 +5067,13 @@
'sources': [
'tools/pbl_tool/pbl_tool.cc',
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },],
+ ],
},
{
'target_name': 'perf_tests',
@@ -5103,6 +5128,9 @@
},
},
},
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
}],
],
},
@@ -5196,6 +5224,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',
@@ -5542,6 +5571,7 @@
'chrome_dll_version',
'installer/installer.gyp:installer_util_strings',
'../views/views.gyp:views',
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
],
}],
],
@@ -5598,6 +5628,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.
@@ -5666,6 +5703,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',
@@ -5690,6 +5734,13 @@
'sources': [
'test/plugin/plugin_test.cpp',
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },],
+ ],
},
{
'target_name': 'reliability_tests',
@@ -5711,6 +5762,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',
@@ -5747,6 +5805,13 @@
'sources': [
'test/selenium/selenium_test.cc',
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },],
+ ],
},
{
'target_name': 'test_chrome_plugin',
« 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