Upstream: Gyp changes to build net_unittests for Android.

base/base.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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 428 matching lines @@
           [ 'OS != "linux" and OS != "openbsd"', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'linux_util.cc',
               ],
             },
           ],
           [ 'OS == "android"', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
-              'debug/stack_trace.cc',
-              'debug/stack_trace_posix.cc',
               'system_monitor/system_monitor_posix.cc',
             ],
             'sources/': [
               ['include', '^process_util_linux\\.cc$'],
               ['include', '^sys_info_linux\\.cc$'],
               ['include', '^worker_pool_linux\\.cc$'],
               # TODO(michaelbai): The below files are excluded because of the
               # missing JNI, add them back when JNI is ready.
               ['exclude', '^android/'],
-              ['exclude', '^message_pump_android\\.cc$'],
               ['exclude', '^base_paths_android\\.cc$'],
               ['exclude', '^debug/stack_trace_android\\.cc$'],
+              ['exclude', '^message_pump_android\\.cc$'],
             ],
           }],
           [ 'OS != "mac"', {
               'sources!': [
                 'mac/scoped_aedesc.h'
               ],
           }],
           # For now, just test the *BSD platforms enough to exclude them.
           # Subsequent changes will include them further.
           [ 'OS != "freebsd"', {
@@ skipping 128 matching lines @@
             ],
         }],
         [ 'OS == "android"', {
           'dependencies': [
             'symbolize',
             '../third_party/ashmem/ashmem.gyp:ashmem#target',
           ],
           'defines': [
             'USE_SYMBOLIZE',
           ],
-          'link_settings': {
-            'libraries': [
-              '-llog',
-            ],
-          },
           'conditions': [
             [ '_toolset=="host" and host_os=="linux"', {
               'dependencies': [
                 '../build/linux/system.gyp:glib',
               ],
+              'sources/': [
+                ['include', '^atomicops_internals_x86_gcc\\.cc$'],
+              ],
+            }],
+            [ '_toolset=="target"', {
+              'sources!': [
+                'debug/stack_trace.cc',
+                'debug/stack_trace_posix.cc',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-llog',
+                ],
+              },
             }],
           ],
         }],
         [ 'os_bsd==1', {
           'include_dirs': [
             '/usr/local/include',
           ],
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
@@ skipping 205 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }