10 files changed, 2 insertions, 100 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)
diff --git a/webrtc/modules/audio_processing/aec/Android.mk b/webrtc/modules/audio_processing/aec/Android.mk
index 39b2df47f1..1d5b900cf2 100644
--- a/webrtc/modules/audio_processing/aec/Android.mk
+++ b/webrtc/modules/audio_processing/aec/Android.mk
@@ -48,10 +48,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)
diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk
index b327bb33d2..fcc3933f5d 100644
--- a/webrtc/modules/audio_processing/aecm/Android.mk
+++ b/webrtc/modules/audio_processing/aecm/Android.mk
@@ -49,12 +49,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)
 
 #########################
@@ -84,12 +78,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_processing/agc/Android.mk b/webrtc/modules/audio_processing/agc/Android.mk
index a9f745619e..9b46d51cb9 100644
--- a/webrtc/modules/audio_processing/agc/Android.mk
+++ b/webrtc/modules/audio_processing/agc/Android.mk
@@ -47,10 +47,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)
diff --git a/webrtc/modules/audio_processing/beamformer/Android.mk b/webrtc/modules/audio_processing/beamformer/Android.mk
index e900a54e9d..4f20566b94 100644
--- a/webrtc/modules/audio_processing/beamformer/Android.mk
+++ b/webrtc/modules/audio_processing/beamformer/Android.mk
@@ -42,10 +42,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../../.. \
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)
diff --git a/webrtc/modules/audio_processing/intelligibility/Android.mk b/webrtc/modules/audio_processing/intelligibility/Android.mk
index 265e580aeb..9ad048b50d 100644
--- a/webrtc/modules/audio_processing/intelligibility/Android.mk
+++ b/webrtc/modules/audio_processing/intelligibility/Android.mk
@@ -41,10 +41,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../../.. \
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)
diff --git a/webrtc/modules/audio_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk
index 773a7cf214..69f1c146a5 100644
--- a/webrtc/modules/audio_processing/ns/Android.mk
+++ b/webrtc/modules/audio_processing/ns/Android.mk
@@ -51,12 +51,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)
 
 #############################
@@ -107,11 +101,5 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
 
-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_processing/transient/Android.mk b/webrtc/modules/audio_processing/transient/Android.mk
index c027009e0c..7534a77ef5 100644
--- a/webrtc/modules/audio_processing/transient/Android.mk
+++ b/webrtc/modules/audio_processing/transient/Android.mk
@@ -44,10 +44,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../../.. \
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)
diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk
index 9d9974db80..c545436e46 100644
--- a/webrtc/modules/audio_processing/utility/Android.mk
+++ b/webrtc/modules/audio_processing/utility/Android.mk
@@ -41,10 +41,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)
diff --git a/webrtc/modules/audio_processing/vad/Android.mk b/webrtc/modules/audio_processing/vad/Android.mk
index 6ac938ad1b..4c9c00bc23 100644
--- a/webrtc/modules/audio_processing/vad/Android.mk
+++ b/webrtc/modules/audio_processing/vad/Android.mk
@@ -47,10 +47,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../../.. \
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 include $(BUILD_STATIC_LIBRARY)