diff options
Diffstat (limited to 'src/modules/audio_processing/Android.mk')
| -rw-r--r-- | src/modules/audio_processing/Android.mk | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index 9ca2aeedf3..4f2979fce6 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -52,12 +52,20 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl \ - libstlport + libdl ifndef NDK_ROOT +ifndef WEBRTC_STL 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) # apm process test app @@ -87,15 +95,21 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libutils \ - libstlport \ libwebrtc_audio_preprocessing LOCAL_MODULE:= webrtc_apm_process_test ifdef NDK_ROOT +LOCAL_SHARED_LIBRARIES += libstlport include $(BUILD_EXECUTABLE) else +ifndef WEBRTC_STL include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) +endif include $(BUILD_NATIVE_TEST) endif @@ -130,14 +144,20 @@ LOCAL_STATIC_LIBRARIES := \ libprotobuf-cpp-2.3.0-lite LOCAL_SHARED_LIBRARIES := \ - libstlport \ libwebrtc_audio_preprocessing LOCAL_MODULE:= webrtc_apm_unit_test ifdef NDK_ROOT +LOCAL_SHARED_LIBRARIES += libstlport include $(BUILD_EXECUTABLE) else +ifndef WEBRTC_STL include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) +endif include $(BUILD_NATIVE_TEST) endif |