diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-24 19:08:43 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-10-25 15:17:01 -0700 |
| commit | c3f927f4f51767b2c9d861a2086e5581adf916c7 (patch) | |
| tree | 2ba9669e79e3038b5c5e14a75dfc4be45326ea3c /webrtc/modules/audio_processing/Android.mk | |
| parent | ff04884918f02e936e7a425ea2281dad9f3d9281 (diff) | |
| download | webrtc-c3f927f4f51767b2c9d861a2086e5581adf916c7.tar.gz | |
Remove unused gnustl webrtc variants
These aren't being used, and were complicating the makefiles.
Test: cs/webrtc gnustl
Change-Id: I256bc9da8e0dc89a11fda6a941a9cb43b8c0bb20
Diffstat (limited to 'webrtc/modules/audio_processing/Android.mk')
| -rw-r--r-- | webrtc/modules/audio_processing/Android.mk | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk index 4ed43eb0dc..3972baad2e 100644 --- a/webrtc/modules/audio_processing/Android.mk +++ b/webrtc/modules/audio_processing/Android.mk @@ -65,12 +65,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../system_wrappers/include \ external/protobuf/src -ifdef WEBRTC_STL -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif - include $(BUILD_STATIC_LIBRARY) # apm process test app @@ -112,27 +106,14 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../system_wrappers/include \ -MY_LIB_SUFFIX := -ifdef WEBRTC_STL -MY_LIB_SUFFIX := _$(WEBRTC_STL) -endif - LOCAL_SHARED_LIBRARIES := \ libutils \ - libwebrtc_audio_preprocessing$(MY_LIB_SUFFIX) \ + libwebrtc_audio_preprocessing \ LOCAL_VENDOR_MODULE := true LOCAL_MODULE := webrtc_apm_process_test -ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite -else -LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-lite-ndk -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif include $(BUILD_NATIVE_TEST) @@ -181,25 +162,12 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../common_audio/signal_processing/include \ external/protobuf/src -MY_LIB_SUFFIX := -ifdef WEBRTC_STL -MY_LIB_SUFFIX := _$(WEBRTC_STL) -endif - LOCAL_SHARED_LIBRARIES := \ - libwebrtc_audio_preprocessing$(MY_LIB_SUFFIX) + libwebrtc_audio_preprocessing LOCAL_VENDOR_MODULE := true LOCAL_MODULE := webrtc_apm_unit_test -ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite -else -LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-lite -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -endif include $(BUILD_NATIVE_TEST) |