base/base.gypi - Issue 1013463003: Update from https://crrev.com/320931

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: base/base.gypi

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 9 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: base/base.gypi

diff --git a/base/base.gypi b/base/base.gypi

index ebc7e3ee60073268510830ddf25af0fde592314b..13cba85da1693ba18a59fd5efa877aff100ddbaf 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -318,14 +318,10 @@

'memory/aligned_memory.h',

'memory/discardable_memory.cc',

'memory/discardable_memory.h',

- 'memory/discardable_memory_android.cc',

- 'memory/discardable_memory_linux.cc',

- 'memory/discardable_memory_mac.cc',

'memory/discardable_memory_shmem.cc',

'memory/discardable_memory_shmem.h',

'memory/discardable_memory_shmem_allocator.cc',

'memory/discardable_memory_shmem_allocator.h',

- 'memory/discardable_memory_win.cc',

'memory/discardable_shared_memory.cc',

'memory/discardable_shared_memory.h',

'memory/linked_ptr.h',

@@ -889,7 +885,6 @@

['include', '^mac/scoped_mach_vm\\.'],

['include', '^mac/scoped_nsautorelease_pool\\.'],

['include', '^mac/scoped_nsobject\\.'],

- ['include', '^memory/discardable_memory_mac\\.'],

['include', '^message_loop/message_pump_mac\\.'],

['include', '^strings/sys_string_conversions_mac\\.'],

['include', '^threading/platform_thread_mac\\.'],

« no previous file with comments | « base/base.gyp ('k') | base/base_paths_win.h » ('j') | no next file with comments »