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

Unified Diff: base/base.gyp

Issue 385049: Implement the memory leak annotations for heap leak checker. (Closed)
Patch Set: Created 11 years, 1 month 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 | « base/DEPS ('k') | base/leak_annotations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 52ffe09de0544be8f35db73a91e7a97f53452609..bcb88f6debf5c28e3a3fe97dc11d85bf195ca87c 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -164,6 +164,7 @@
'keyboard_codes_posix.h',
'lazy_instance.cc',
'lazy_instance.h',
+ 'leak_annotations.h',
'leak_tracker.h',
'linked_list.h',
'linked_ptr.h',
@@ -378,15 +379,38 @@
[ 'OS == "linux" or OS == "freebsd"', {
'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'],
['exclude', '\\.mm?$' ] ],
+ 'variables' : {
+ 'linux_use_heapchecker%' : 0,
+ },
'conditions': [
[ 'chromeos==1 or toolkit_views==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
},
],
- [ 'linux_use_tcmalloc==1', {
+ [ 'linux_use_heapchecker==1', {
+ 'defines': [
+ 'LINUX_USE_HEAPCHECKER',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'LINUX_USE_HEAPCHECKER',
+ ],
+ },
+ },
+ ],
+ # linux_use_heapchecker==1 implies linux_use_tcmalloc=1.
+ [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', {
'dependencies': [
'../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
],
+ 'defines': [
+ 'LINUX_USE_TCMALLOC',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'LINUX_USE_TCMALLOC',
+ ],
+ },
},
],
],
« no previous file with comments | « base/DEPS ('k') | base/leak_annotations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698