diff options
-rw-r--r-- | app/app.gyp | 9 | ||||
-rw-r--r-- | build/temp_gyp/googleurl.gyp | 11 | ||||
-rwxr-xr-x | chrome/chrome_tests.gypi | 36 | ||||
-rw-r--r-- | ipc/ipc.gyp | 9 | ||||
-rw-r--r-- | media/media.gyp | 7 | ||||
-rw-r--r-- | net/net.gyp | 9 | ||||
-rw-r--r-- | printing/printing.gyp | 9 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 20 |
8 files changed, 104 insertions, 6 deletions
diff --git a/app/app.gyp b/app/app.gyp index 8984fa8..b7e31a6 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -77,6 +77,15 @@ 'win_util_unittest.cc', ], }], + ['OS =="linux" or OS =="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 0df561c..20da6ab 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -69,6 +69,17 @@ '../../googleurl/src/url_util_unittest.cc', '../../googleurl/src/gurl_test_main.cc', ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], + ], }, ], } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d4e52cb..882de59 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -387,6 +387,15 @@ 'test/ui/sandbox_uitests.cc', ], }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { @@ -1001,6 +1010,15 @@ 'common/net/url_util_unittest.cc', ], }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { @@ -1142,6 +1160,15 @@ ], }, }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], # conditions }, # target browser_tests { @@ -1182,6 +1209,15 @@ '<(allocator_target)', ], },], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index 0d7c5b7..d823bec 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -63,6 +63,15 @@ '../views/views.gyp:views', ], }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }] ], }, ], diff --git a/media/media.gyp b/media/media.gyp index bc071f4..f53c35d 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -211,6 +211,13 @@ # gtk/gtk.h '../build/linux/system.gyp:gtk', ], + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], }], ], }, diff --git a/net/net.gyp b/net/net.gyp index f5adb65..3f12c697 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -686,6 +686,15 @@ ], }, ], + ['OS == "linux" or OS == "freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], [ 'OS == "mac"', { 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ], }, diff --git a/printing/printing.gyp b/printing/printing.gyp index b483f0b..3f48ef7 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -112,6 +112,15 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, ], diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 7a7b61e..532da24 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -291,12 +291,11 @@ }], ['OS=="linux"', { 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - '../../../base/allocator/allocator.gyp:allocator', - ], - }, - ], + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../../../base/allocator/allocator.gyp:allocator', + ], + }], ], 'dependencies': [ '../../../build/linux/system.gyp:gtk', @@ -478,6 +477,15 @@ '../webcore_unit_tests/TransparencyWin_unittest.cpp', ], }], + ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../../../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { |