base/base.gyp - Issue 885443002: Roll Chrome into Mojo.

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.gyp

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Rebase to ToT mojo Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

Index: base/base.gyp

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

index 114cad64ac16bbc88905e4904b63eef80da44798..7565646e70a2152a3f4f428119fddee0e571aea0 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -482,13 +482,6 @@

'debug/proc_maps_linux_unittest.cc',

'debug/stack_trace_unittest.cc',

'debug/task_annotator_unittest.cc',

- 'debug/trace_event_argument_unittest.cc',

- 'debug/trace_event_memory_unittest.cc',

- 'debug/trace_event_synthetic_delay_unittest.cc',

- 'debug/trace_event_system_stats_monitor_unittest.cc',

- 'debug/trace_event_unittest.cc',

- 'debug/trace_event_unittest.h',

- 'debug/trace_event_win_unittest.cc',

'deferred_sequenced_task_runner_unittest.cc',

'environment_unittest.cc',

'file_version_info_unittest.cc',

@@ -653,6 +646,12 @@

'timer/mock_timer_unittest.cc',

'timer/timer_unittest.cc',

'tools_sanity_unittest.cc',

+ 'trace_event/trace_event_argument_unittest.cc',

+ 'trace_event/trace_event_memory_unittest.cc',

+ 'trace_event/trace_event_synthetic_delay_unittest.cc',

+ 'trace_event/trace_event_system_stats_monitor_unittest.cc',

+ 'trace_event/trace_event_unittest.cc',

+ 'trace_event/trace_event_win_unittest.cc',

'tracked_objects_unittest.cc',

'tuple_unittest.cc',

'values_unittest.cc',

@@ -929,8 +928,6 @@

'test/mock_chrome_application_mac.mm',

'test/mock_devices_changed_observer.cc',

'test/mock_devices_changed_observer.h',

- 'test/mock_time_provider.cc',

- 'test/mock_time_provider.h',

'test/multiprocess_test.cc',

'test/multiprocess_test.h',

'test/multiprocess_test_android.cc',

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