From 43ea04236b20286e21ae4ec49134f9b95d4bb9f0 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:25:35 +0000
Subject: [PATCH] Change android makefile to build webrtc for android/x86 as
 well Review URL: http://webrtc-codereview.appspot.com/68002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@208 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../audio_processing/aec/main/source/Android.mk     | 13 ++++++++++---
 .../audio_processing/aecm/main/source/Android.mk    |  5 ++++-
 .../audio_processing/agc/main/source/Android.mk     |  5 ++++-
 src/modules/audio_processing/main/source/Android.mk |  7 +++++--
 .../audio_processing/ns/main/source/Android.mk      |  6 ++++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/modules/audio_processing/aec/main/source/Android.mk b/src/modules/audio_processing/aec/main/source/Android.mk
index a0c1cd31d..f16f26b72 100644
--- a/src/modules/audio_processing/aec/main/source/Android.mk
+++ b/src/modules/audio_processing/aec/main/source/Android.mk
@@ -16,9 +16,9 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_GENERATED_SOURCES :=
 LOCAL_SRC_FILES := \
     echo_cancellation.c \
+    resampler.c \
     aec_core.c \
-    aec_rdft.c \
-    resampler.c
+    aec_rdft.c 
 
 # Flags passed to both C and C++ files.
 MY_CFLAGS :=  
@@ -27,9 +27,16 @@ MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
     '-DWEBRTC_LINUX' \
-    '-DWEBRTC_THREAD_RR' \
+    '-DWEBRTC_THREAD_RR'
+ifeq ($(TARGET_ARCH),arm) 
+MY_DEFS += \
     '-DWEBRTC_ANDROID' \
     '-DANDROID' 
+else
+LOCAL_SRC_FILES += \
+    aec_core_sse2.c \
+    aec_rdft_sse2.c
+endif
 LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/src/modules/audio_processing/aecm/main/source/Android.mk b/src/modules/audio_processing/aecm/main/source/Android.mk
index ec18258d2..7ed9f3616 100644
--- a/src/modules/audio_processing/aecm/main/source/Android.mk
+++ b/src/modules/audio_processing/aecm/main/source/Android.mk
@@ -25,9 +25,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
     '-DWEBRTC_LINUX' \
-    '-DWEBRTC_THREAD_RR' \
+    '-DWEBRTC_THREAD_RR'
+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/modules/audio_processing/agc/main/source/Android.mk b/src/modules/audio_processing/agc/main/source/Android.mk
index 2fd97bdf8..e04583914 100644
--- a/src/modules/audio_processing/agc/main/source/Android.mk
+++ b/src/modules/audio_processing/agc/main/source/Android.mk
@@ -19,9 +19,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
     '-DWEBRTC_LINUX' \
-    '-DWEBRTC_THREAD_RR' \
+    '-DWEBRTC_THREAD_RR'
+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/modules/audio_processing/main/source/Android.mk b/src/modules/audio_processing/main/source/Android.mk
index 12c7bc758..634ad6ad4 100644
--- a/src/modules/audio_processing/main/source/Android.mk
+++ b/src/modules/audio_processing/main/source/Android.mk
@@ -35,11 +35,14 @@ MY_DEFS := '-DNO_TCMALLOC' \
     '-DWEBRTC_TARGET_PC' \
     '-DWEBRTC_LINUX' \
     '-DWEBRTC_THREAD_RR' \
-    '-DWEBRTC_ANDROID' \
-    '-DANDROID' \
     '-DWEBRTC_NS_FIXED'
 #   floating point
 #   -DWEBRTC_NS_FLOAT'
+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/modules/audio_processing/ns/main/source/Android.mk b/src/modules/audio_processing/ns/main/source/Android.mk
index f7444d52e..07ec98ecd 100644
--- a/src/modules/audio_processing/ns/main/source/Android.mk
+++ b/src/modules/audio_processing/ns/main/source/Android.mk
@@ -22,10 +22,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
     '-DNO_HEAPCHECKER' \
     '-DWEBRTC_TARGET_PC' \
     '-DWEBRTC_LINUX' \
-    '-DWEBRTC_THREAD_RR' \
+    '-DWEBRTC_THREAD_RR'
+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