diff options
Diffstat (limited to 'src/modules/audio_processing/ns/Android.mk')
-rw-r--r-- | src/modules/audio_processing/ns/Android.mk | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk index 255f4709cb..d7149e60c6 100644 --- a/src/modules/audio_processing/ns/Android.mk +++ b/src/modules/audio_processing/ns/Android.mk @@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \ nsx_core.c # Files for floating point. -# noise_suppression.c ns_core.c +# noise_suppression.c ns_core.c # Flags passed to both C and C++ files. LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) @@ -39,12 +39,21 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl \ - libstlport + libdl ifndef NDK_ROOT +ifndef WEBRTC_STL +LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) endif +else +LOCAL_SHARED_LIBRARIES += libstlport +endif + include $(BUILD_STATIC_LIBRARY) ############################# @@ -73,7 +82,17 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include ifndef NDK_ROOT +ifndef WEBRTC_STL +LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) endif +else +LOCAL_SHARED_LIBRARIES += libstlport +endif + include $(BUILD_STATIC_LIBRARY) endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) |