base/trace_event/memory_dump_manager.cc - Issue 1422623002: Build fixes for fnl/musl

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/trace_event/memory_dump_manager.cc

Issue 1422623002: Build fixes for fnl/musl (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: fix android build Created 5 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/trace_event/memory_dump_manager.cc

diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc

index 1e4d8229aef0b2a69ae9cf9f51f6547dc64203da..15abb91f7a5fe25e54ac87f87c1fc714794f2ad4 100644

--- a/base/trace_event/memory_dump_manager.cc

+++ b/base/trace_event/memory_dump_manager.cc

@@ -176,7 +176,7 @@ void MemoryDumpManager::Initialize() {

RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance());

#endif

-#if defined(OS_LINUX) || defined(OS_ANDROID)

+#if (defined(OS_LINUX) && !defined(FNL_MUSL)) || defined(OS_ANDROID)

RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance());

RegisterDumpProvider(MallocDumpProvider::GetInstance());

#endif