Index: chrome/chrome.gyp |
=================================================================== |
--- chrome/chrome.gyp (revision 26246) |
+++ chrome/chrome.gyp (working copy) |
@@ -2932,13 +2932,23 @@ |
['OS=="linux"', { |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |
], |
+ 'export_dependent_settings': [ |
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |
+ ], |
}], |
# Windows-specific rules. |
['OS=="win"', { |
'include_dirs': [ |
'third_party/wtl/include', |
], |
+ 'dependencies': [ |
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |
+ ], |
+ 'export_dependent_settings': [ |
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |
+ ], |
},], |
], |
}, |
@@ -3595,6 +3605,9 @@ |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
], |
+ 'export_dependent_settings': [ |
+ 'renderer', |
+ ], |
'include_dirs': [ |
'..', |
], |
@@ -3675,6 +3688,9 @@ |
'../skia/skia.gyp:skia', |
'../testing/gtest.gyp:gtest', |
], |
+ 'export_dependent_settings': [ |
+ 'test_support_common', |
+ ], |
'include_dirs': [ |
'..', |
], |
@@ -4673,7 +4689,6 @@ |
'../net/net.gyp:net_resources', |
'../build/util/support/support.gyp:*', |
'../third_party/cld/cld.gyp:cld', |
- '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', |
'../views/views.gyp:views', |
'../webkit/webkit.gyp:webkit_resources', |
'../gears/gears.gyp:gears', |