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

Unified Diff: base/base.gypi

Issue 111713008: base: Refactor DiscardableMemoryProvider to build and be tested on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix native_discardable_memory on ios. Created 7 years 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 eb580525e268397ffa5492a3b0cc2686c68c0081..11edab009685fe11c2bbb4d5437390be16328475 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -292,13 +292,17 @@
'memory/aligned_memory.cc',
'memory/aligned_memory.h',
'memory/discardable_memory.h',
- 'memory/discardable_memory_allocator_android.h',
'memory/discardable_memory_allocator_android.cc',
+ 'memory/discardable_memory_allocator_android.h',
'memory/discardable_memory_android.cc',
+ 'memory/discardable_memory_android.h',
'memory/discardable_memory_emulated.cc',
+ 'memory/discardable_memory_emulated.h',
+ 'memory/discardable_memory_linux.cc',
'memory/discardable_memory_mac.cc',
'memory/discardable_memory_provider.cc',
'memory/discardable_memory_provider.h',
+ 'memory/discardable_memory_win.cc',
'memory/linked_ptr.h',
'memory/manual_constructor.h',
'memory/memory_pressure_listener.cc',
@@ -868,14 +872,6 @@
'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/'] ],
},
« no previous file with comments | « base/base.gyp ('k') | base/memory/discardable_memory_emulated.h » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698