From c3f927f4f51767b2c9d861a2086e5581adf916c7 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 24 Oct 2017 19:08:43 -0700 Subject: Remove unused gnustl webrtc variants These aren't being used, and were complicating the makefiles. Test: cs/webrtc gnustl Change-Id: I256bc9da8e0dc89a11fda6a941a9cb43b8c0bb20 --- .../audio_coding/codecs/isac/fix/source/Android.mk | 12 ----------- .../audio_coding/codecs/isac/fix/test/Android.mk | 24 ++++++---------------- 2 files changed, 6 insertions(+), 30 deletions(-) (limited to 'webrtc/modules/audio_coding/codecs/isac/fix') 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) -- cgit v1.2.3