Upstream: Build net_unittests for Android.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index c9c292d28f4ad10d44f9efe5a1feb7efc3aac40d..6b27b4d5dad808e9c2cb29964dc39574a80da927 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -8,8 +8,8 @@
 
     'linux_link_kerberos%': 0,
     'conditions': [
-      ['chromeos==1', {
-        # Disable Kerberos on ChromeOS, at least for now.
+      ['chromeos==1 or OS=="android"', {
+        # Disable Kerberos on ChromeOS and Android, at least for now.
         # It needs configuration (krb5.conf and so on).
         'use_kerberos%': 0,
       }, {  # chromeos == 0
@@ -39,6 +39,8 @@
         'ssl_false_start_blacklist_process#host',
       ],
       'sources': [
+        'android/network_library.cc',
+        'android/network_library.h',
         'base/address_family.h',
         'base/address_list.cc',
         'base/address_list.h',
@@ -182,6 +184,7 @@
         'base/nss_memio.h',
         'base/openssl_memory_private_key_store.cc',
         'base/openssl_private_key_store.h',
+        'base/openssl_private_key_store_android.cc',
         'base/origin_bound_cert_service.cc',
         'base/origin_bound_cert_service.h',
         'base/origin_bound_cert_store.h',
@@ -245,6 +248,7 @@
         'base/x509_certificate_mac.cc',
         'base/x509_certificate_nss.cc',
         'base/x509_certificate_openssl.cc',
+        'base/x509_certificate_openssl_android.cc',
         'base/x509_certificate_win.cc',
         'base/x509_util.h',
         'base/x509_util_nss.cc',
@@ -927,6 +931,17 @@
               # Android can shut down our app at any time, so we persist session cookies.
               'ENABLE_PERSISTENT_SESSION_COOKIES'
             ],
+            'dependencies': [
+              '../build/android/system.gyp:ssl',
+            ],
+            'sources!': [
+              'dns/dns_config_service_posix.cc',

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

I see this service isn't actually used in chrome anywhere yet, and
http://crbug.com/90881 doesn't seem to mention what it will be used for. Have
you checked with them? Just wonder if we need a TODO or bug link here to track
if/when we would need a corresponding implementation of it.

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

Added it back with a few #if clauses.

+            ],
+            'sources/': [
+              # TODO(jingzhao): The below files are excluded because of the
+              # missing JNI, add them back when JNI is ready.

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

nit: missing JNI -> missing availability of JNI bindings in the build system, or
missing availability to test code?

+              ['exclude', '^android/'],
+            ],
           }, {  # else OS! = "android"
             'defines': [
               # These are the features Android doesn't support.
@@ -936,6 +951,13 @@
           },
         ],
       ],
+      'target_conditions': [
+        ['OS == "android"', {
+          'sources/': [
+            ['include', '^base/platform_mime_util_linux\\.cc$'],
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'net_unittests',
@@ -1162,7 +1184,7 @@
             ],
           },
         ],
-        [ 'os_posix == 1 and OS != "mac"', {
+        [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1221,6 +1243,16 @@
             ],
           },
         ],
+        [ 'OS == "android"', {
+            'dependencies': [
+              '../build/android/system.gyp:ssl',
+            ],
+            'sources!': [
+              'dns/dns_config_service_posix_unittest.cc',
+              'dns/dns_config_service_unittest.cc',
+            ],
+          },
+        ],
       ],
     },
     {
@@ -1357,7 +1389,7 @@
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
-        ['os_posix == 1 and OS != "mac"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
@@ -1370,7 +1402,7 @@
             }],
           ],
         }],
-        ['os_posix == 1 and OS != "mac"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1483,7 +1515,7 @@
     },
   ],
   'conditions': [
-     ['os_posix == 1 and OS != "mac"', {
+     ['os_posix == 1 and OS != "mac" and OS != "android"', {
        'targets': [
          {
            'target_name': 'flip_in_mem_edsm_server',