diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:56:38 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 14:56:38 +0000 |
| commit | be467e454acfd0ac9dfca010e880bf5945e4c5b8 (patch) | |
| tree | 39d7bfc0720177568f6e37c7e14d3184433d1a58 /base/base.gypi | |
| parent | 1dfaafff161e63028306aeccd15bb95e64ab275e (diff) | |
| download | chromium_src-be467e454acfd0ac9dfca010e880bf5945e4c5b8.zip chromium_src-be467e454acfd0ac9dfca010e880bf5945e4c5b8.tar.gz chromium_src-be467e454acfd0ac9dfca010e880bf5945e4c5b8.tar.bz2 | |
Reland r267170 "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
TBR=willchan@chromium.org
Review URL: https://codereview.chromium.org/253323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/base/base.gypi b/base/base.gypi index 09a3afa..1767014 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', |