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

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: Fix MemoryAfterUnlock test 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 b60ffa6feb9b7a0ac4bb773ac6111710b953ab5f..eeda3e12d7a160275dfab40d7ab10954c4c2bc08 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -283,10 +283,12 @@
'mac/sdk_forward_declarations.h',
'memory/aligned_memory.cc',
'memory/aligned_memory.h',
- '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',
@@ -847,6 +849,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