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

Unified Diff: base/base.gyp

Issue 1584893002: Allow base to depend on allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move is_nacl condition to allocator group Created 4 years, 11 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
« no previous file with comments | « base/allocator/allocator.gyp ('k') | no next file » | 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 94a1d49258572d0833fca927e599874541efca0f..b08994e0428e0aa95cfcdf5462712bd748d0b639 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -21,6 +21,7 @@
'optimize': 'max',
},
'dependencies': [
+ 'allocator/allocator.gyp:allocator',
Nico 2016/01/20 14:47:39 allocator is now on some platforms a source-less s
Primiano Tucci (use gerrit) 2016/01/20 14:50:29 Yup. See the already existing TODO(primiano) in al
'base_debugging_flags#target',
'base_static',
'../testing/gtest.gyp:gtest_prod',
@@ -761,14 +762,7 @@
'dependencies': [
'malloc_wrapper',
],
- 'conditions': [
- ['use_allocator!="none"', {
- 'dependencies': [
- 'allocator/allocator.gyp:allocator',
- ],
- }],
- ]},
- ],
+ }],
[ 'OS == "win" and target_arch == "x64"', {
'sources': [
'profiler/win32_stack_frame_unwinder_unittest.cc',
@@ -789,16 +783,6 @@
4267,
],
'conditions': [
- # This is needed so base_unittests uses the allocator shim, as
- # SecurityTest.MemoryAllocationRestriction* tests are dependent
- # on tcmalloc.
- # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
- # their own test suite.
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- 'allocator/allocator.gyp:allocator',
- ],
- }],
['icu_use_data_file_flag==0', {
# This is needed to trigger the dll copy step on windows.
# TODO(mark): This should not be necessary.
« no previous file with comments | « base/allocator/allocator.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698