trunk/src/base/base.gypi - Issue 257383004: Revert 267170 "Use DiscardableMemoryManager on Android."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/base/base.gypi

Issue 257383004: Revert 267170 "Use DiscardableMemoryManager on Android." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

Index: trunk/src/base/base.gypi

===================================================================

--- trunk/src/base/base.gypi (revision 267174)

+++ trunk/src/base/base.gypi (working copy)

@@ -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',

« no previous file with comments | « trunk/src/base/base.gyp ('k') | trunk/src/base/memory/discardable_memory.h » ('j') | no next file with comments »