diff options
-rw-r--r-- | Android.mk | 8 | ||||
-rw-r--r-- | src/common_audio/resampler/Android.mk | 5 | ||||
-rw-r--r-- | src/common_audio/signal_processing/Android.mk | 5 | ||||
-rw-r--r-- | src/common_audio/vad/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/source/Android.mk | 10 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/test/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/main/source/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_processing/Android.mk | 22 | ||||
-rw-r--r-- | src/modules/audio_processing/aec/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_processing/aecm/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_processing/agc/Android.mk | 5 | ||||
-rw-r--r-- | src/modules/audio_processing/ns/Android.mk | 10 | ||||
-rw-r--r-- | src/modules/audio_processing/utility/Android.mk | 5 | ||||
-rw-r--r-- | src/system_wrappers/source/Android.mk | 5 |
14 files changed, 24 insertions, 76 deletions
diff --git a/Android.mk b/Android.mk index 36c133c026..9761549a54 100644 --- a/Android.mk +++ b/Android.mk @@ -34,17 +34,13 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \ libwebrtc_ns_neon endif -LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-2.3.0-lite - LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ - libstlport + libprotobuf-cpp-lite \ LOCAL_PRELINK_MODULE := false -include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -70,11 +66,9 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ - libstlport LOCAL_PRELINK_MODULE := false -include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) diff --git a/src/common_audio/resampler/Android.mk b/src/common_audio/resampler/Android.mk index 338a902c8b..842e9e46dc 100644 --- a/src/common_audio/resampler/Android.mk +++ b/src/common_audio/resampler/Android.mk @@ -41,10 +41,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES += libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/common_audio/signal_processing/Android.mk b/src/common_audio/signal_processing/Android.mk index 357b1e7b62..552e83633f 100644 --- a/src/common_audio/signal_processing/Android.mk +++ b/src/common_audio/signal_processing/Android.mk @@ -80,10 +80,7 @@ LOCAL_SRC_FILES_arm64 += $(my_c_src) LOCAL_SRC_FILES_x86_64 += $(my_c_src) LOCAL_SRC_FILES_mips64 += $(my_c_src) -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/common_audio/vad/Android.mk b/src/common_audio/vad/Android.mk index c434e81647..33934ecabb 100644 --- a/src/common_audio/vad/Android.mk +++ b/src/common_audio/vad/Android.mk @@ -44,10 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES += libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk index 151138bdf3..aed687bf11 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -75,10 +75,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) @@ -119,10 +116,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk index 12e4b0c528..066738afd2 100644 --- a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk @@ -54,10 +54,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= webrtc_isac_test -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_coding/codecs/isac/main/source/Android.mk b/src/modules/audio_coding/codecs/isac/main/source/Android.mk index d96c163928..889ba3fe95 100644 --- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk @@ -65,10 +65,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index a63cbd6a63..6ab9b3dd49 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -61,9 +61,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl -ifndef WEBRTC_STL -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) @@ -99,10 +97,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../system_wrappers/interface \ external/gtest/include -LOCAL_STATIC_LIBRARIES := \ - libgtest \ - libprotobuf-cpp-2.3.0-lite - MY_LIB_SUFFIX := ifdef WEBRTC_STL MY_LIB_SUFFIX := _$(WEBRTC_STL) @@ -115,8 +109,11 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= webrtc_apm_process_test ifndef WEBRTC_STL -include external/stlport/libstlport.mk +LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else +LOCAL_STATIC_LIBRARIES := \ + libgtest \ + libprotobuf-cpp-2.3.0-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) @@ -156,10 +153,6 @@ LOCAL_C_INCLUDES := \ external/gtest/include \ external/protobuf/src -LOCAL_STATIC_LIBRARIES := \ - libgtest \ - libprotobuf-cpp-2.3.0-lite - MY_LIB_SUFFIX := ifdef WEBRTC_STL MY_LIB_SUFFIX := _$(WEBRTC_STL) @@ -171,8 +164,11 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= webrtc_apm_unit_test ifndef WEBRTC_STL -include external/stlport/libstlport.mk +LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else +LOCAL_STATIC_LIBRARIES := \ + libgtest \ + libprotobuf-cpp-2.3.0-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/aec/Android.mk b/src/modules/audio_processing/aec/Android.mk index f4d9e16989..a8f0e910e0 100644 --- a/src/modules/audio_processing/aec/Android.mk +++ b/src/modules/audio_processing/aec/Android.mk @@ -46,10 +46,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk index 27285d7662..3aa14ebd50 100644 --- a/src/modules/audio_processing/aecm/Android.mk +++ b/src/modules/audio_processing/aecm/Android.mk @@ -46,10 +46,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk index 21e943ffc6..97447cb851 100644 --- a/src/modules/audio_processing/agc/Android.mk +++ b/src/modules/audio_processing/agc/Android.mk @@ -43,10 +43,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk index 4494ac0051..9a4badf614 100644 --- a/src/modules/audio_processing/ns/Android.mk +++ b/src/modules/audio_processing/ns/Android.mk @@ -48,10 +48,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) @@ -87,10 +84,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/modules/audio_processing/utility/Android.mk b/src/modules/audio_processing/utility/Android.mk index 4d86d16fac..726a093212 100644 --- a/src/modules/audio_processing/utility/Android.mk +++ b/src/modules/audio_processing/utility/Android.mk @@ -43,10 +43,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index ce2555be64..774cc284dd 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -58,10 +58,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/spreadsortlib -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) |