Upstream: Build net_unittests for Android.

net/base/dnsrr_resolver.cc

Index: net/base/dnsrr_resolver.cc
diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc
index 1d0956649df06ad942907eefea8a4599fc498b80..46c53edc9f984739513d6a49468501b2728e75c7 100644
--- a/net/base/dnsrr_resolver.cc
+++ b/net/base/dnsrr_resolver.cc
@@ -176,7 +176,13 @@ class RRResolverWorker {
 
  private:
 
-#if defined(OS_POSIX)
+#if defined(OS_ANDROID)
+
+  void Run() {
+    NOTIMPLEMENTED();
+  }
+
+#elif defined(OS_POSIX)
 
   void Run() {
     // Runs on a worker thread.
@@ -406,7 +412,7 @@ bool RRResponse::HasExpired(const base::Time current_time) const {
 
 bool RRResponse::ParseFromResponse(const uint8* p, unsigned len,
                                    uint16 rrtype_requested) {
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
   name.clear();
   ttl = 0;
   dnssec = false;
@@ -485,7 +491,7 @@ bool RRResponse::ParseFromResponse(const uint8* p, unsigned len,
       signatures.push_back(std::string(rrdata.data(), rrdata.size()));
     }
   }
-#endif  // defined(OS_POSIX)
+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID)

[joth, 2011/11/02 18:57:05]

surprised there's no #else here. (Windows never needs to ParseFromResponse?
seems to be missing a comment at least ... ideally a default #error case)

For ANDROID I think it should be a NOTIMPLEMENTED, anyway.

[Jing Zhao, 2011/11/03 17:49:08]

ParseFromResponse() is only called by Do() in the previous OS_POSIX block. The
OS_WIN block doesn't use it. In net/base/dnsrr_resolver.h, the comment of this
function says "For testing only". How about put the entire function between #if
and #endif, since other platforms never use it?

 
   return true;
 }