Remove unused gnustl webrtc variants

am: c3f927f4f5

Change-Id: I185117b455e7d2eb2cc32ab53a5d0dacd0f687af

20 files changed, 8 insertions, 202 deletions

diff --git a/Android.mk b/Android.mk
index 2112d4dcc5..d0cb5e027c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -83,29 +83,6 @@ LOCAL_SHARED_LIBRARIES := \
 include $(BUILD_SHARED_LIBRARY)
 
 
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc_audio_coding_gnustl_static
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-    libwebrtc_isac_gnustl_static \
-    libwebrtc_isacfix_gnustl_static \
-    libwebrtc_spl_gnustl_static \
-    libwebrtc_system_wrappers_gnustl_static
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
-    libwebrtc_isacfix_neon_gnustl_static
-endif
-
-LOCAL_NDK_STL_VARIANT := gnustl_static
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_STATIC_LIBRARY)
-
 webrtc_path := $(LOCAL_PATH)
 # voice
 include $(webrtc_path)/webrtc/base/Android.mk
@@ -126,10 +103,3 @@ include $(webrtc_path)/webrtc/modules/audio_processing/transient/Android.mk
 include $(webrtc_path)/webrtc/modules/audio_processing/utility/Android.mk
 include $(webrtc_path)/webrtc/modules/audio_processing/vad/Android.mk
 include $(webrtc_path)/webrtc/system_wrappers/source/Android.mk
-
-# libwebrtc_audio_coding_gnustl_static dependencies
-WEBRTC_STL := gnustl_static
-include $(webrtc_path)/webrtc/system_wrappers/source/Android.mk
-include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
-include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
-include $(webrtc_path)/webrtc/common_audio/signal_processing/Android.mk
diff --git a/webrtc/base/Android.mk b/webrtc/base/Android.mk
index 069e22ba81..d1b9097b36 100644
--- a/webrtc/base/Android.mk
+++ b/webrtc/base/Android.mk
@@ -49,12 +49,6 @@ 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
-
 LOCAL_SHARED_LIBRARIES += liblog
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk
index 31f4b3068c..6b4d4bf57b 100644
--- a/webrtc/common_audio/Android.mk
+++ b/webrtc/common_audio/Android.mk
@@ -55,10 +55,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/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk
index 5ddef2d2a5..5b788577d2 100644
--- a/webrtc/common_audio/resampler/Android.mk
+++ b/webrtc/common_audio/resampler/Android.mk
@@ -45,10 +45,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../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/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk
index 97319c6672..8f4b8cbb3a 100644
--- a/webrtc/common_audio/signal_processing/Android.mk
+++ b/webrtc/common_audio/signal_processing/Android.mk
@@ -99,10 +99,4 @@ LOCAL_SRC_FILES += \
     spl_sqrt_floor.c
 endif
 
-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/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk
index 2b328deeb7..6f5c781317 100644
--- a/webrtc/common_audio/vad/Android.mk
+++ b/webrtc/common_audio/vad/Android.mk
@@ -43,10 +43,4 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../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_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)
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)
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk
index 93ee0a6b49..c63c47b37c 100644
--- a/webrtc/system_wrappers/source/Android.mk
+++ b/webrtc/system_wrappers/source/Android.mk
@@ -57,12 +57,6 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/spreadsortlib
 
-ifdef WEBRTC_STL
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
-
 LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
 
 include $(BUILD_STATIC_LIBRARY)