base/base.gypi - Issue 669813003: Update from chromium https://crrev.com/301725/

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

Patch Set: Created 6 years, 2 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 954252984e1d2ff999e31ee7199238d43f0f3136..416a7e5aa6ee7ea25f1e935a372f6b70b9ef1be8 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -63,6 +63,7 @@

'android/jni_weak_ref.h',

'android/library_loader/library_loader_hooks.cc',

'android/library_loader/library_loader_hooks.h',

+ 'android/library_loader/library_load_from_apk_status_codes.h',

'android/memory_pressure_listener_android.cc',

'android/memory_pressure_listener_android.h',

'android/java_handler_thread.cc',

@@ -496,10 +497,12 @@

'process/process_metrics_win.cc',

'process/process_posix.cc',

'process/process_win.cc',

- 'profiler/scoped_profile.cc',

- 'profiler/scoped_profile.h',

'profiler/alternate_timer.cc',

'profiler/alternate_timer.h',

+ 'profiler/scoped_profile.cc',

+ 'profiler/scoped_profile.h',

+ 'profiler/scoped_tracker.cc',

+ 'profiler/scoped_tracker.h',

'profiler/tracked_time.cc',

'profiler/tracked_time.h',

'rand_util.cc',

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