Upstream: Gyp changes to build net_unittests for Android.

build/common.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1185 matching lines @@
               # Don't warn about printf format problems.
               # This is off by default in gcc but on in Ubuntu's gcc(!).
               '-Wno-format',
             ],
             'cflags_cc!': [
               # TODO(fischman): remove this.
               # http://code.google.com/p/chromium/issues/detail?id=90453
               '-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.
               # Currently this option is not set for Chrome OS build because
               # the current version of gcc (4.3.4) used for building Chrome in
               # Chrome OS chroot doesn't support this option.
               # OpenBSD does not support this option either, since it's using
               # gcc 4.2.1, which does not have this flag yet.
               # TODO(mazda): remove the conditional for Chrome OS when gcc
               # version is upgraded.
@@ skipping 855 matching lines @@
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
               '-Wl,--icf=safe',  # Enable identical code folding to reduce size
               # Don't export symbols from statically linked libraries.
               '-Wl,--exclude-libs=ALL',
             ],
-            'libraries!': [
-               '-lrt',  # librt is built into Bionic.
-               # Not supported by Android toolchain.
-               # Where do these come from?  Can't find references in
-               # any Chromium gyp or gypi file.  Maybe they come from
-               # gyp itself?
-               '-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',
-             ],
-             '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', {
                 'ldflags': [
                   '-Wl,-rpath-link=<(android_ndk_lib)',
                   '-L<(android_ndk_lib)',
                 ],
               }],
               # NOTE: The stlport header include paths below are specified in
               # cflags rather than include_dirs because they need to come
@@ skipping 514 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }