| Index: net/base/dns_reloader.cc
|
| diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc
|
| index 276d1a0b16a31e532f038e46809032f414fb289d..d29ae6ac53d8d18f8d869bc0ae09716d414997ea 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>
|
|
|
| @@ -34,6 +35,9 @@ namespace {
|
| // the same trick there and most *BSD's don't yet have support for
|
| // FilePathWatcher (but perhaps the new kqueue mac code just needs to be
|
| // ported to *BSD to support that).
|
| +//
|
| +// Android does not have /etc/resolv.conf. The system takes care of nameserver
|
| +// changes, so none of this is needed.
|
|
|
| class DnsReloader : public net::NetworkChangeNotifier::DNSObserver {
|
| public:
|
| @@ -119,4 +123,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)
|
|
|