Clean up Android.mk

Review URL: http://webrtc-codereview.appspot.com/92014

git-svn-id: http://webrtc.googlecode.com/svn/trunk@315 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_processing/aec/main/source/Android.mk

@@ -10,6 +10,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aec
 LOCAL_MODULE_TAGS := optional
@@ -17,23 +19,15 @@ LOCAL_SRC_FILES := \
     echo_cancellation.c \
     resampler.c \
     aec_core.c \
-    aec_rdft.c 
+    aec_rdft.c \
+    aec_core_sse2.c \
+    aec_rdft_sse2.c
+
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_SRC_FILES += \
-    aec_core_sse2.c \
-    aec_rdft_sse2.c
-# TODO(leozwang): __SSE2__ is defined by chromium/webrtc
-# Remove it when we have a platform-independent SSE2 flag.
-# And it should be in common flags.
-LOCAL_CFLAGS += \
-    '-D__SSE2__'
-endif
-
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../utility \

src/modules/audio_processing/aecm/main/source/Android.mk

@@ -10,19 +10,21 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_aecm
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_control_mobile.c \
-    aecm_core.c 
+    aecm_core.c \
+    aecm_delay_estimator.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
-# Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../utility \

src/modules/audio_processing/agc/main/source/Android.mk

@@ -1,9 +1,17 @@
-# This file is generated by gyp; do not edit. This means you!
+# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
 
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_agc
@@ -16,7 +24,6 @@ LOCAL_SRC_FILES := \
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
-# Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../../.. \

src/modules/audio_processing/main/source/Android.mk

@@ -10,6 +10,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../android-webrtc.mk
+
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_apm
 LOCAL_MODULE_TAGS := optional

src/modules/audio_processing/main/test/process_test/Android.mk

@@ -12,6 +12,8 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
@@ -26,7 +28,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../interface \
     $(LOCAL_PATH)/../../../../.. \
     $(LOCAL_PATH)/../../../../../system_wrappers/interface \
-    external/gtest/include \
+    external/gtest/include
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest 
@@ -34,11 +36,13 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libstlport \
-    libwebrtc_audio_preprocessing 
+    libwebrtc_audio_preprocessing
 
 LOCAL_MODULE:= webrtc_apm_process_test
 
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
+ifdef NDK_ROOT
 include $(BUILD_EXECUTABLE)
+else
+include external/stlport/libstlport.mk
+include $(BUILD_NATIVE_TEST)
+endif

src/modules/audio_processing/main/test/unit_test/Android.mk

@@ -12,6 +12,8 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
@@ -20,7 +22,8 @@ LOCAL_SRC_FILES:= \
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
-    $(MY_WEBRTC_COMMON_DEFS)
+    $(MY_WEBRTC_COMMON_DEFS) \
+    '-DWEBRTC_APM_UNIT_TEST_FIXED_PROFILE'
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../interface \
@@ -41,7 +44,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= webrtc_apm_unit_test
 
-ifndef NDK_ROOT
-include external/stlport/libstlport.mk
-endif
+ifdef NDK_ROOT
 include $(BUILD_EXECUTABLE)
+else
+include external/stlport/libstlport.mk
+include $(BUILD_NATIVE_TEST)
+endif

src/modules/audio_processing/ns/main/source/Android.mk

@@ -1,9 +1,17 @@
-# This file is generated by gyp; do not edit. This means you!
+# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
 
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_ns
 LOCAL_MODULE_TAGS := optional
@@ -19,7 +27,6 @@ LOCAL_SRC_FILES := \
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
-# Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../utility \

src/modules/audio_processing/utility/Android.mk

@@ -10,6 +10,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
+
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_apm_utility