diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:02:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:02:05 +0000 |
commit | cc3f37b54e81022a7fe5565e232bb5b8f056aa0d (patch) | |
tree | 2ba9669e79e3038b5c5e14a75dfc4be45326ea3c /webrtc/modules/audio_coding | |
parent | ff04884918f02e936e7a425ea2281dad9f3d9281 (diff) | |
parent | c3f927f4f51767b2c9d861a2086e5581adf916c7 (diff) | |
download | webrtc-cc3f37b54e81022a7fe5565e232bb5b8f056aa0d.tar.gz |
Remove unused gnustl webrtc variants
am: c3f927f4f5
Change-Id: I185117b455e7d2eb2cc32ab53a5d0dacd0f687af
Diffstat (limited to 'webrtc/modules/audio_coding')
3 files changed, 6 insertions, 36 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) diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk index f1d30742e2..b5f5415b80 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk @@ -66,10 +66,4 @@ 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) |