From 3c0a86f83d4d3d58351e08583ba77fc182b28b69 Mon Sep 17 00:00:00 2001
From: "leozwang@google.com"
 <leozwang@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 14 Jul 2011 18:23:07 +0000
Subject: [PATCH] Change android makefile to be able to build for x86 Review
 URL: http://webrtc-codereview.appspot.com/68001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@207 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/common_audio/resampler/main/source/Android.mk            | 5 ++++-
 .../signal_processing_library/main/source/Android.mk         | 5 ++++-
 src/common_audio/vad/main/source/Android.mk                  | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common_audio/resampler/main/source/Android.mk b/src/common_audio/resampler/main/source/Android.mk
index b78e3afe0..e639e106d 100644
--- a/src/common_audio/resampler/main/source/Android.mk
+++ b/src/common_audio/resampler/main/source/Android.mk
@@ -24,9 +24,12 @@ MY_CFLAGS_C :=
 MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
-    '-DWEBRTC_LINUX' \
+    '-DWEBRTC_LINUX'
+ifeq ($(TARGET_ARCH),arm) 
+MY_DEFS += \
     '-DWEBRTC_ANDROID' \
     '-DANDROID' 
+endif
 LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/src/common_audio/signal_processing_library/main/source/Android.mk b/src/common_audio/signal_processing_library/main/source/Android.mk
index 8b08676f8..401a7f673 100644
--- a/src/common_audio/signal_processing_library/main/source/Android.mk
+++ b/src/common_audio/signal_processing_library/main/source/Android.mk
@@ -67,9 +67,12 @@ MY_CFLAGS_C :=
 MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
-    '-DWEBRTC_LINUX' \
+    '-DWEBRTC_LINUX' 
+ifeq ($(TARGET_ARCH),arm) 
+MY_DEFS += \
     '-DWEBRTC_ANDROID' \
     '-DANDROID' 
+endif
 LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/src/common_audio/vad/main/source/Android.mk b/src/common_audio/vad/main/source/Android.mk
index fba6ca150..f52df935d 100644
--- a/src/common_audio/vad/main/source/Android.mk
+++ b/src/common_audio/vad/main/source/Android.mk
@@ -28,9 +28,12 @@ MY_CFLAGS_C :=
 MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
-    '-DWEBRTC_LINUX' \
+    '-DWEBRTC_LINUX' 
+ifeq ($(TARGET_ARCH),arm) 
+MY_DEFS += \
     '-DWEBRTC_ANDROID' \
     '-DANDROID' 
+endif
 LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
 
 # Include paths placed before CFLAGS/CPPFLAGS