net/base/dns_reloader.cc - Issue 8429034: Upstream: Build net_unittests for Android.

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: net/base/dns_reloader.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: fix llog -- it's not for all targets Created 9 years, 1 month 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: net/base/dns_reloader.cc

diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc

index d45c14563a9656058e50b0dc62b9ed38c10700cf..703d795cb6f615e2383f2d3b0a1e722a04dae75d 100644

--- a/net/base/dns_reloader.cc

+++ b/net/base/dns_reloader.cc

@@ -4,7 +4,8 @@

#include "net/base/dns_reloader.h"

-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)

+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \

+ !defined(OS_ANDROID)

#include <resolv.h>

@@ -119,4 +120,5 @@ void DnsReloaderMaybeReload() {

} // namespace net

-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)

+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) &&

+ // !defined(OS_ANDROID)