Upstream: Build net_unittests for Android.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 896245e7f261f383707b59bc7c65c2bd20ce646b..b1b70a7509c42c74d278f2b1f6556a49813575d6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1190,7 +1190,7 @@
               '-Wsign-compare',
             ]
           }],
-          [ 'os_posix==1 and OS!="mac" and OS!="openbsd" and chromeos==0', {
+          [ 'os_posix==1 and OS!="mac" and OS!="openbsd" and OS!="android" and chromeos==0', {
             'cflags': [
               # Don't warn about ignoring the return value from e.g. close().
               # This is off by default in some gccs but on by default in others.
@@ -2068,15 +2068,15 @@
                # any Chromium gyp or gypi file.  Maybe they come from
                # gyp itself?
                '-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',

[Ryan Sleevi, 2011/11/08 15:03:23]

Now that you have build/android/ssl, double check to see if these libraries are
still being added. nss3 - nspr4 are all NSS libraries - none of which should be
included if use_openssl=1

[jingzhao, 2011/11/09 04:27:25]

I double checked and it looks like all these are no longer added. Thank you.

-             ],
-             'libraries': [
-               '-l<(android_stlport_library)',
-               # Manually link the libgcc.a that the cross compiler uses.
-               '<!($CROSS_CC -print-libgcc-file-name)',
-               '-lc',
-               '-ldl',
-               '-lstdc++',
-               '-lm',
+            ],
+            'libraries': [
+              '-l<(android_stlport_library)',
+              # Manually link the libgcc.a that the cross compiler uses.
+              '<!($CROSS_CC -print-libgcc-file-name)',
+              '-lc',
+              '-ldl',
+              '-lstdc++',
+              '-lm',
             ],
             'conditions': [
               ['android_build_type==0', {