diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 11:41:16 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 11:41:16 +0000 |
| commit | ae7c9f4d3c23cbd5ef60508a5710beccad59a428 (patch) | |
| tree | 57379ee4e0467f4310c5ba35202180002fcf59a8 /net/base/dns_reloader.cc | |
| parent | 3d40d9e210b016e3148640be63bfc1c5f16827c5 (diff) | |
| download | chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.zip chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.tar.gz chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.tar.bz2 | |
Upstream: Build net_unittests for Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8429034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/dns_reloader.cc')
| -rw-r--r-- | net/base/dns_reloader.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc index 276d1a0..d29ae6ac 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) |