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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/base.gypi

Issue 195863005: Use DiscardableMemoryManager on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add |DiscardableMemoryAshmem::is_locked| Created 6 years, 8 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
« base/base.gyp ('K') | « base/base.gyp ('k') | base/memory/discardable_memory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 09a3afaad6f91df6f178cd259e202c14a72f10c8..1767014bd870dd2c49daafafc963e29c99f283aa 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -304,8 +304,6 @@
'memory/aligned_memory.h',
'memory/discardable_memory.cc',
'memory/discardable_memory.h',
- 'memory/discardable_memory_allocator_android.cc',
- 'memory/discardable_memory_allocator_android.h',
'memory/discardable_memory_android.cc',
'memory/discardable_memory_emulated.cc',
'memory/discardable_memory_emulated.h',
@@ -770,6 +768,14 @@
['include', '^threading/platform_thread_linux\\.cc$'],
],
}],
+ ['OS == "android" and _toolset == "target"', {
+ 'sources': [
+ 'memory/discardable_memory_ashmem_allocator.cc',
+ 'memory/discardable_memory_ashmem_allocator.h',
+ 'memory/discardable_memory_ashmem.cc',
+ 'memory/discardable_memory_ashmem.h',
+ ],
+ }],
['OS == "android" and >(nacl_untrusted_build)==0', {
'sources!': [
'base_paths_posix.cc',
« base/base.gyp ('K') | « base/base.gyp ('k') | base/memory/discardable_memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698