base/base.gypi - Issue 952893003: Update from https://crrev.com/317530

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 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 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 37a8171277c9d749eb0e17416994d1661a050883..b7c33b83423e3d10a1f07f73a28cc4f259239437 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -44,7 +44,6 @@

'android/jni_android.h',

'android/jni_array.cc',

'android/jni_array.h',

- 'android/jni_onload_delegate.h',

'android/jni_registrar.cc',

'android/jni_registrar.h',

'android/jni_string.cc',

@@ -672,6 +671,10 @@

'trace_event/memory_dump_provider.h',

'trace_event/process_memory_dump.cc',

'trace_event/process_memory_dump.h',

+ 'trace_event/process_memory_totals.cc',

+ 'trace_event/process_memory_totals.h',

+ 'trace_event/process_memory_totals_dump_provider.cc',

+ 'trace_event/process_memory_totals_dump_provider.h',

'trace_event/trace_event.h',

'trace_event/trace_event_android.cc',

'trace_event/trace_event_argument.cc',

« no previous file with comments | « base/base.gyp ('k') | base/i18n/break_iterator.cc » ('j') | no next file with comments »