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

Unified Diff: base/base.gypi

Issue 17106004: Add discardable memory emulation for non-android/mac platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review feedback Created 7 years, 2 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.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 73e6ccc05e4dfa0950dc2b71932efcbc01632bfa..3a91024749b486208f6890ae1481bdca58fd1a2d 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -286,7 +286,10 @@
'memory/discardable_memory.cc',
'memory/discardable_memory.h',
'memory/discardable_memory_android.cc',
+ 'memory/discardable_memory_emulated.cc',
'memory/discardable_memory_mac.cc',
+ 'memory/discardable_memory_provider.cc',
+ 'memory/discardable_memory_provider.h',
'memory/linked_ptr.h',
'memory/manual_constructor.h',
'memory/memory_pressure_listener.cc',
@@ -845,6 +848,14 @@
'sources/': [ ['exclude', '^win/'] ],
},
],
+ ['<(native_discardable_memory)==1', {
+ 'sources!': [
+ 'memory/discardable_memory_emulated.cc',
+ 'memory/discardable_memory_provider.cc',
+ 'memory/discardable_memory_provider.h',
+ ],
+ },
+ ],
['OS != "android" or >(nacl_untrusted_build)==1', {
'sources/': [ ['exclude', '^android/'] ],
},

Powered by Google App Engine
This is Rietveld 408576698