base/base.gyp - Issue 1028333002: Chromium -> Mojo roll.

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 1028333002: Chromium -> Mojo roll. (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:

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 c7a24811dc6348d11b77d6bdcd0b2d80ce453805..ac37a890496cde6254ba16e8c498dba06198c3ea 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -595,6 +595,7 @@

'process/process_metrics_unittest_ios.cc',

'process/process_unittest.cc',

'process/process_util_unittest.cc',

+ 'profiler/stack_sampling_profiler_unittest.cc',

'profiler/tracked_time_unittest.cc',

'rand_util_unittest.cc',

'scoped_clear_errno_unittest.cc',

@@ -656,15 +657,6 @@

'timer/mock_timer_unittest.cc',

'timer/timer_unittest.cc',

'tools_sanity_unittest.cc',

- 'trace_event/memory_dump_manager_unittest.cc',

- 'trace_event/process_memory_maps_dump_provider_unittest.cc',

- 'trace_event/process_memory_totals_dump_provider_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',

@@ -689,6 +681,7 @@

'win/startup_information_unittest.cc',

'win/win_util_unittest.cc',

'win/wrapped_window_proc_unittest.cc',

+ '<@(trace_event_test_sources)',

'dependencies': [

'base',

@@ -975,8 +968,8 @@

'test/simple_test_tick_clock.h',

'test/task_runner_test_template.cc',

'test/task_runner_test_template.h',

- 'test/test_discardable_memory_shmem_allocator.cc',

- 'test/test_discardable_memory_shmem_allocator.h',

+ 'test/test_discardable_memory_allocator.cc',

+ 'test/test_discardable_memory_allocator.h',

'test/test_file_util.cc',

'test/test_file_util.h',

'test/test_file_util_android.cc',

« no previous file with comments | « base/android/java/src/org/chromium/base/library_loader/Linker.java ('k') | base/base.gypi » ('j') | no next file with comments »