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/dns | |
| 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/dns')
| -rw-r--r-- | net/dns/dns_config_service_posix.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 3385c52..f7833bc 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -30,24 +30,28 @@ class DnsConfigServicePosix::ConfigReader : public SerialWorker { success_(false) {} void DoWork() OVERRIDE { + success_ = false; +#if defined(OS_ANDROID) + NOTIMPLEMENTED(); +#else #if defined(OS_OPENBSD) + // Note: res_ninit in glibc always returns 0 and sets RES_INIT. + // res_init behaves the same way. if ((res_init() == 0) && (_res.options & RES_INIT)) { success_ = ConvertResToConfig(_res, &dns_config_); + } #else struct __res_state res; if ((res_ninit(&res) == 0) && (res.options & RES_INIT)) { success_ = ConvertResToConfig(res, &dns_config_); -#endif - } else { - // Note: res_ninit in glibc always returns 0 and sets RES_INIT. - // res_init behaves the same way. - success_ = false; } +#endif #if defined(OS_MACOSX) res_ndestroy(&res); #elif !defined(OS_OPENBSD) res_nclose(&res); #endif +#endif // defined(OS_ANDROID) } void OnWorkFinished() OVERRIDE { @@ -84,6 +88,7 @@ DnsConfigService* DnsConfigService::CreateSystemService() { return new DnsConfigServicePosix(); } +#if !defined(OS_ANDROID) bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) { CHECK(dns_config != NULL); DCHECK(res.options & RES_INIT); @@ -136,5 +141,6 @@ bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) { return true; } +#endif // !defined(OS_ANDROID) } // namespace net |