diff options
Diffstat (limited to 'src/modules/audio_coding/codecs/isac/fix/source/Android.mk')
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/source/Android.mk | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk index b47a4a5407..bd95ed8125 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -69,21 +69,12 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl + libdl \ + libstlport 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) ######################### @@ -113,19 +104,10 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(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) @@ -164,13 +146,5 @@ LOCAL_MODULE:= webrtc_isac_test ifdef NDK_ROOT include $(BUILD_EXECUTABLE) else -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 include $(BUILD_NATIVE_TEST) endif |