diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 19:09:30 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 19:09:30 +0000 |
| commit | 63dc378eac88be2da11255b61d7af140bb89ba55 (patch) | |
| tree | e5ae5e3659b8a9bafa3d93f09072901e20338f59 /base/base.gypi | |
| parent | 7e96b7ac9c98f54506da88a4d69e9012b164761f (diff) | |
| download | chromium_src-63dc378eac88be2da11255b61d7af140bb89ba55.zip chromium_src-63dc378eac88be2da11255b61d7af140bb89ba55.tar.gz chromium_src-63dc378eac88be2da11255b61d7af140bb89ba55.tar.bz2 | |
Drop allocator dependency from base library.
This will fix libnpapi_test_plugin from loading TCMalloc.
This undoes the bad dependency from base to allocator added in http://src.chromium.org/viewvc/chrome/trunk/src/base/base.gyp?revision=43477&view=markup, which was required to fix the linux shared build, due to http://src.chromium.org/viewvc/chrome?view=rev&revision=41218 which added the base/profiler.cc compile-time dependency on TCMalloc (rather than a link-time dependency injection, relying on something like weak symbols)
The purify/quantify dependency is indeed compile-time, and is appropriately done in profiler.cc. But, to simply this change, I've killed profiler.cc and only used it in the profiler extension. We can add it back if needed, but it's only been used in that one place for a long time anyway.
BUG=59317,40467
TEST=make -j15 npapi_test_plugin && nm out/Debug/libnpapi_test_plugin.so | grep TCMalloc. Should be empty.
Review URL: http://codereview.chromium.org/3783009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/base/base.gypi b/base/base.gypi index 992cdcc..2adb528 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -179,8 +179,6 @@ 'process_util_posix.cc', 'process_util_win.cc', 'process_win.cc', - 'profiler.cc', - 'profiler.h', 'rand_util.cc', 'rand_util.h', 'rand_util_posix.cc', @@ -550,12 +548,6 @@ }, }, ], - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - 'allocator/allocator.gyp:allocator', - ], - }, - ], ], 'dependencies': [ 'symbolize', |