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

Unified Diff: base/allocator/allocator.gyp

Issue 10391178: 1. Enable large object pointer offset check in release build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Index: base/allocator/allocator.gyp
===================================================================
--- base/allocator/allocator.gyp (revision 137587)
+++ base/allocator/allocator.gyp (working copy)
@@ -201,7 +201,7 @@
'allocator_shim.cc',
'allocator_shim.h',
'generic_allocators.cc',
- 'win_allocator.cc',
+ 'win_allocator.cc',
],
# sources! means that these are not compiled directly.
'sources!': [
@@ -428,9 +428,10 @@
],
},
{
- # This library is linked in to libbase and allocator_unittests.
- # It can't depend on either and nothing else should depend on it -
- # all other code should use the interfaced provided by libbase.
+ # This library is linked in to src/base.gypi:base, allocator_unittests and
+ # tcmalloc_unittests. It can't depend on either and nothing else should
+ # depend on it - all other code should use the interfaced provided by
+ # base.
'target_name': 'allocator_extension_thunks',
'type': 'static_library',
'sources': [
@@ -503,6 +504,35 @@
},
},
},
+ {
+ 'target_name': 'tcmalloc_unittest',
+ 'type': 'executable',
+ 'sources': [
+ 'tcmalloc_unittest.cc',
+
+ # Part of chromium code(instead of TCMalloc). We don't include the
gpike 2012/05/21 19:04:58 space before open paren
+ # TCMalloc version(atomicops-internals-x86.cc) in allocator library,
+ # so need this for replacement.
+ '../atomicops_internals_x86_gcc.cc',
gpike 2012/05/21 19:04:58 This is gcc specific? What happens on Windows/Mac
kaiwang 2012/05/21 22:21:42 This is removed since this is now depending on bas
+
+ # Code allocator_shim.cc depends on.
+ '../profiler/alternate_timer.cc',
+ '../profiler/alternate_timer.h',
+ ],
+ 'include_dirs': [
+ # This is tricky.. We add this include dir so alternate_timer.cc will
gpike 2012/05/21 19:04:58 .. should be .
kaiwang 2012/05/21 22:21:42 ? which ..?
+ # use TCMalloc's logging.h, instead of the chromium base/logging.h as
+ # in other build targets.
+ '<(tcmalloc_dir)/src',
+
+ '../..',
+ ],
+ 'dependencies': [
+ 'allocator',
+ 'allocator_extension_thunks',
+ '../../testing/gtest.gyp:gtest',
+ ],
+ },
],
}],
],
« no previous file with comments | « no previous file | base/allocator/allocator_extension_thunks.cc » ('j') | third_party/tcmalloc/chromium/src/tcmalloc.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698