From 9018c9f548abb8258c7b3e4432e7597de9b58868 Mon Sep 17 00:00:00 2001
From: "tommi@webrtc.org"
 <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 19 Apr 2012 15:38:10 +0000
Subject: [PATCH] Fix androidndk build take two.

TBR=xians

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2069 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/{atomic32_linux.cc => atomic32_posix.cc}    |  0
 src/system_wrappers/source/system_wrappers.gyp         | 10 ++++------
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename src/system_wrappers/source/{atomic32_linux.cc => atomic32_posix.cc} (100%)

diff --git a/src/system_wrappers/source/atomic32_linux.cc b/src/system_wrappers/source/atomic32_posix.cc
similarity index 100%
rename from src/system_wrappers/source/atomic32_linux.cc
rename to src/system_wrappers/source/atomic32_posix.cc
diff --git a/src/system_wrappers/source/system_wrappers.gyp b/src/system_wrappers/source/system_wrappers.gyp
index 0451a341f6..8b6d63ec6e 100644
--- a/src/system_wrappers/source/system_wrappers.gyp
+++ b/src/system_wrappers/source/system_wrappers.gyp
@@ -48,8 +48,8 @@
         '../interface/tick_util.h',
         '../interface/trace.h',
         'aligned_malloc.cc',
-        'atomic32_linux.cc',
         'atomic32_mac.cc',
+        'atomic32_posix.cc',
         'atomic32_win.cc',
         'condition_variable.cc',
         'condition_variable_posix.cc',
@@ -109,11 +109,6 @@
         },{
           'sources!': [ 'data_log.cc', ],
         },],
-        ['OS=="android"', {
-          'sources': [
-            'atomic32_linux.cc',
-          ]
-        }], # OS==android
         ['OS=="linux"', {
           'link_settings': {
             'libraries': [ '-lrt', ],
@@ -123,6 +118,9 @@
           'link_settings': {
             'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ],
           },
+          'sources!': [
+            'atomic32_posix.cc',
+          ],
         }],
         ['OS=="win"', {
           'link_settings': {