From cb39c52e93d8fb9fac9f97a0128e2db71bd15b8d Mon Sep 17 00:00:00 2001 From: "pliard@chromium.org" Date: Wed, 30 Apr 2014 11:15:49 +0000 Subject: Revert 267170 "Use DiscardableMemoryManager on Android." > Use DiscardableMemoryManager on Android. > > This allows userspace (DiscardableMemoryManager) to control eviction of > unlocked DiscardableMemory instances to prevent the process from running out of > address space in cases of heavy use of unlocked DiscardableMemory. > > This also removes all the occurences of 'Android' from the ashmem allocator to > allow it to be later used on ChromeOS. > > BUG=327516, 334996 > R=reveman@chromium.org, willchan@chromium.org > > Review URL: https://codereview.chromium.org/195863005 TBR=pliard@chromium.org Review URL: https://codereview.chromium.org/257383004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267175 0039d316-1c4b-4281-b951-d872f2087c98 --- base/base.gypi | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'base/base.gypi') diff --git a/base/base.gypi b/base/base.gypi index 1767014..09a3afa 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -304,6 +304,8 @@ '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', @@ -768,14 +770,6 @@ ['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', -- cgit v1.1