diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:09:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:09:32 +0000 |
| commit | 7dac89c0f521219611c841f542ca81d6a958ef90 (patch) | |
| tree | 2ba9669e79e3038b5c5e14a75dfc4be45326ea3c /webrtc/modules/audio_coding/codecs/isac/fix | |
| parent | 27e27fd000a27903abd66d9e366d72b3e27dc4b3 (diff) | |
| parent | dcb7e9ea5c7a57a7da89fc85ad250f23d134cf73 (diff) | |
| download | webrtc-7dac89c0f521219611c841f542ca81d6a958ef90.tar.gz | |
Remove unused gnustl webrtc variants am: c3f927f4f5 am: cc3f37b54e
am: dcb7e9ea5c
Change-Id: I87240ad1d4d6545dc39f93b3082d24525c16fdf3
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/isac/fix')
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk | 12 | ||||
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk | 24 |
2 files changed, 6 insertions, 30 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk index 7fdc534334..709874c277 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -83,12 +83,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - include $(BUILD_STATIC_LIBRARY) ######################### @@ -122,12 +116,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - include $(BUILD_STATIC_LIBRARY) endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk index d6a03a02ff..48e56c5f34 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk +++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk @@ -34,22 +34,17 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../../../../../../.. -MY_LIB_SUFFIX := -ifdef WEBRTC_STL -MY_LIB_SUFFIX := _$(WEBRTC_STL) -endif - LOCAL_STATIC_LIBRARIES := \ - libwebrtc_isacfix$(MY_LIB_SUFFIX) \ - libwebrtc_spl$(MY_LIB_SUFFIX) \ - libwebrtc_system_wrappers$(MY_LIB_SUFFIX) + libwebrtc_isacfix \ + libwebrtc_spl \ + libwebrtc_system_wrappers ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) -# We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX) +# We need to dup libwebrtc_isacfix because ibwebrtc_isacfix_neon # has dependency on it. LOCAL_STATIC_LIBRARIES_arm += \ - libwebrtc_isacfix$(MY_LIB_SUFFIX) \ - libwebrtc_isacfix_neon$(MY_LIB_SUFFIX) + libwebrtc_isacfix \ + libwebrtc_isacfix_neon endif LOCAL_SHARED_LIBRARIES := \ @@ -57,11 +52,4 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := webrtc_isac_test -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -LOCAL_SHARED_LIBRARIES := -endif - include $(BUILD_NATIVE_TEST) |