diff options
Diffstat (limited to 'src/common_audio/vad/Android.mk')
| -rw-r--r-- | src/common_audio/vad/Android.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/common_audio/vad/Android.mk b/src/common_audio/vad/Android.mk index b7be3f0307..6cacbdb940 100644 --- a/src/common_audio/vad/Android.mk +++ b/src/common_audio/vad/Android.mk @@ -30,11 +30,10 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../signal_processing/include + $(LOCAL_PATH)/../signal_processing/include LOCAL_SHARED_LIBRARIES := \ - libdl \ - libstlport + libdl ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread @@ -45,6 +44,16 @@ LOCAL_SHARED_LIBRARIES += libdl endif 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) |