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

Unified Diff: base/base.gyp

Issue 1675143004: Allocator shim skeleton + Linux impl behind a build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shim_exp_flag
Patch Set: rebase Created 4 years, 10 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/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 2b93cdac4ab5a7f43667d6493d24bf525c6ec1ac..b6398c53252d7970c9141c769046ee7d0494416e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -22,6 +22,7 @@
},
'dependencies': [
'allocator/allocator.gyp:allocator',
+ 'allocator/allocator.gyp:allocator_features',
'base_debugging_flags#target',
'base_static',
'base_build_date#target',
@@ -234,6 +235,9 @@
'sync_socket_posix.cc',
]
}],
+ ['use_experimental_allocator_shim==1', {
+ 'dependencies': [ 'allocator/allocator.gyp:unified_allocator_shim']
+ }],
],
'sources': [
'auto_reset.h',
@@ -718,6 +722,9 @@
'third_party/libevent/libevent.gyp:libevent'
],
}],
+ ['use_experimental_allocator_shim==1', {
+ 'sources': [ 'allocator/allocator_shim_unittest.cc']
+ }],
], # conditions
'target_conditions': [
['OS == "ios" and _toolset != "host"', {

Powered by Google App Engine
This is Rietveld 408576698