diff --git a/src/modules/audio_processing/aec/main/source/Android.mk b/src/modules/audio_processing/aec/main/source/Android.mk index f16f26b72..f041956c9 100644 --- a/src/modules/audio_processing/aec/main/source/Android.mk +++ b/src/modules/audio_processing/aec/main/source/Android.mk @@ -13,7 +13,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_aec LOCAL_MODULE_TAGS := optional -LOCAL_GENERATED_SOURCES := LOCAL_SRC_FILES := \ echo_cancellation.c \ resampler.c \ @@ -21,41 +20,32 @@ LOCAL_SRC_FILES := \ aec_rdft.c # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' -ifeq ($(TARGET_ARCH),arm) -MY_DEFS += \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' -else +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_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) -# Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../.. \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../../utility \ + $(LOCAL_PATH)/../../../../.. \ $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := - -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY) diff --git a/src/modules/audio_processing/aecm/main/source/Android.mk b/src/modules/audio_processing/aecm/main/source/Android.mk index 7ed9f3616..41a013a33 100644 --- a/src/modules/audio_processing/aecm/main/source/Android.mk +++ b/src/modules/audio_processing/aecm/main/source/Android.mk @@ -14,42 +14,27 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_aecm LOCAL_MODULE_TAGS := optional -LOCAL_GENERATED_SOURCES := -LOCAL_SRC_FILES := echo_control_mobile.c \ +LOCAL_SRC_FILES := \ + echo_control_mobile.c \ aecm_core.c # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' -ifeq ($(TARGET_ARCH),arm) -MY_DEFS += \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' -endif -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) +LOCAL_CFLAGS := \ + $(MY_WEBRTC_COMMON_DEFS) # Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../.. \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../../utility \ + $(LOCAL_PATH)/../../../../.. \ $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := - -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY) diff --git a/src/modules/audio_processing/agc/main/source/Android.mk b/src/modules/audio_processing/agc/main/source/Android.mk index e04583914..700258029 100644 --- a/src/modules/audio_processing/agc/main/source/Android.mk +++ b/src/modules/audio_processing/agc/main/source/Android.mk @@ -8,42 +8,26 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_agc LOCAL_MODULE_TAGS := optional -LOCAL_GENERATED_SOURCES := -LOCAL_SRC_FILES := analog_agc.c \ +LOCAL_SRC_FILES := \ + analog_agc.c \ digital_agc.c # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' -ifeq ($(TARGET_ARCH),arm) -MY_DEFS += \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' -endif -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) +LOCAL_CFLAGS := \ + $(MY_WEBRTC_COMMON_DEFS) # Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../.. \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ + $(LOCAL_PATH)/../../../../.. \ $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := -# Duplicate the static libraries to fix circular references -LOCAL_STATIC_LIBRARIES += $(LOCAL_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY) diff --git a/src/modules/audio_processing/main/source/Android.mk b/src/modules/audio_processing/main/source/Android.mk index 634ad6ad4..66abcb8ce 100644 --- a/src/modules/audio_processing/main/source/Android.mk +++ b/src/modules/audio_processing/main/source/Android.mk @@ -14,8 +14,8 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE := libwebrtc_apm LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc -LOCAL_GENERATED_SOURCES := -LOCAL_SRC_FILES := audio_buffer.cc \ +LOCAL_SRC_FILES := \ + audio_buffer.cc \ audio_processing_impl.cc \ echo_cancellation_impl.cc \ echo_control_mobile_impl.cc \ @@ -28,48 +28,31 @@ LOCAL_SRC_FILES := audio_buffer.cc \ voice_detection_impl.cc # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' \ +LOCAL_CFLAGS := \ + $(MY_WEBRTC_COMMON_DEFS) \ '-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 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../.. \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../interface \ - $(LOCAL_PATH)/../../../../system_wrappers/interface \ $(LOCAL_PATH)/../../aec/main/interface \ $(LOCAL_PATH)/../../aecm/main/interface \ $(LOCAL_PATH)/../../agc/main/interface \ $(LOCAL_PATH)/../../ns/main/interface \ + $(LOCAL_PATH)/../../../interface \ + $(LOCAL_PATH)/../../../.. \ $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \ - $(LOCAL_PATH)/../../../../common_audio/vad/main/interface + $(LOCAL_PATH)/../../../../common_audio/vad/main/interface \ + $(LOCAL_PATH)/../../../../system_wrappers/interface -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := - -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := - +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY) diff --git a/src/modules/audio_processing/main/test/process_test/Android.mk b/src/modules/audio_processing/main/test/process_test/Android.mk index 23080aab2..7dc773051 100644 --- a/src/modules/audio_processing/main/test/process_test/Android.mk +++ b/src/modules/audio_processing/main/test/process_test/Android.mk @@ -19,20 +19,14 @@ LOCAL_SRC_FILES:= \ # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' + $(MY_WEBRTC_COMMON_DEFS) -LOCAL_CPPFLAGS := -LOCAL_LDFLAGS := LOCAL_C_INCLUDES := \ - external/gtest/include \ - $(LOCAL_PATH)/../../../../../system_wrappers/interface \ $(LOCAL_PATH)/../../interface \ $(LOCAL_PATH)/../../../../interface \ - $(LOCAL_PATH)/../../../../.. + $(LOCAL_PATH)/../../../../.. \ + $(LOCAL_PATH)/../../../../../system_wrappers/interface \ + external/gtest/include \ LOCAL_STATIC_LIBRARIES := \ libgtest @@ -44,5 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= webrtc_apm_process_test +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_EXECUTABLE) diff --git a/src/modules/audio_processing/ns/main/source/Android.mk b/src/modules/audio_processing/ns/main/source/Android.mk index 07ec98ecd..b883420ce 100644 --- a/src/modules/audio_processing/ns/main/source/Android.mk +++ b/src/modules/audio_processing/ns/main/source/Android.mk @@ -16,37 +16,22 @@ LOCAL_SRC_FILES := \ # noise_suppression.c ns_core.c # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' -ifeq ($(TARGET_ARCH),arm) -MY_DEFS += \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' -endif -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) +LOCAL_CFLAGS := \ + $(MY_WEBRTC_COMMON_DEFS) # Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../.. \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../../utility \ + $(LOCAL_PATH)/../../../../.. \ $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := - -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY) diff --git a/src/modules/audio_processing/utility/Android.mk b/src/modules/audio_processing/utility/Android.mk index 7e758cea2..9892c95f2 100644 --- a/src/modules/audio_processing/utility/Android.mk +++ b/src/modules/audio_processing/utility/Android.mk @@ -14,36 +14,24 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_apm_utility LOCAL_MODULE_TAGS := optional -LOCAL_GENERATED_SOURCES := -LOCAL_SRC_FILES := fft4g.c \ +LOCAL_SRC_FILES := \ + fft4g.c \ ring_buffer.c # Flags passed to both C and C++ files. -MY_CFLAGS := -MY_CFLAGS_C := -MY_DEFS := '-DNO_TCMALLOC' \ - '-DNO_HEAPCHECKER' \ - '-DWEBRTC_TARGET_PC' \ - '-DWEBRTC_LINUX' \ - '-DWEBRTC_THREAD_RR' \ - '-DWEBRTC_ANDROID' \ - '-DANDROID' -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) +LOCAL_CFLAGS := \ + $(MY_WEBRTC_COMMON_DEFS) # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES := \ $(LOCAL_PATH) -# Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := -LOCAL_LDFLAGS := - -LOCAL_STATIC_LIBRARIES := - -LOCAL_SHARED_LIBRARIES := libcutils \ +LOCAL_SHARED_LIBRARIES := \ + libcutils \ libdl \ libstlport -LOCAL_ADDITIONAL_DEPENDENCIES := +ifndef NDK_ROOT include external/stlport/libstlport.mk +endif include $(BUILD_STATIC_LIBRARY)