aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk4
-rw-r--r--src/common_audio/resampler/Android.mk4
-rw-r--r--src/common_audio/signal_processing/Android.mk6
-rw-r--r--src/common_audio/vad/Android.mk4
-rw-r--r--src/modules/audio_coding/codecs/isac/fix/source/Android.mk14
-rw-r--r--src/modules/audio_coding/codecs/isac/fix/test/Android.mk14
-rw-r--r--src/modules/audio_coding/codecs/isac/main/source/Android.mk8
-rw-r--r--src/modules/audio_processing/Android.mk14
-rw-r--r--src/modules/audio_processing/aec/Android.mk4
-rw-r--r--src/modules/audio_processing/aecm/Android.mk8
-rw-r--r--src/modules/audio_processing/agc/Android.mk4
-rw-r--r--src/modules/audio_processing/ns/Android.mk8
-rw-r--r--src/modules/audio_processing/utility/Android.mk4
-rw-r--r--src/system_wrappers/source/Android.mk8
14 files changed, 9 insertions, 95 deletions
diff --git a/Android.mk b/Android.mk
index 5dbbc1d918..36c133c026 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,9 +44,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_PRELINK_MODULE := false
-ifndef NDK_ROOT
include external/stlport/libstlport.mk
-endif
include $(BUILD_SHARED_LIBRARY)
@@ -76,9 +74,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_PRELINK_MODULE := false
-ifndef NDK_ROOT
include external/stlport/libstlport.mk
-endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/src/common_audio/resampler/Android.mk b/src/common_audio/resampler/Android.mk
index 9d052ed248..338a902c8b 100644
--- a/src/common_audio/resampler/Android.mk
+++ b/src/common_audio/resampler/Android.mk
@@ -41,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -50,8 +49,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/common_audio/signal_processing/Android.mk b/src/common_audio/signal_processing/Android.mk
index fc342467a5..357b1e7b62 100644
--- a/src/common_audio/signal_processing/Android.mk
+++ b/src/common_audio/signal_processing/Android.mk
@@ -80,9 +80,6 @@ LOCAL_SRC_FILES_arm64 += $(my_c_src)
LOCAL_SRC_FILES_x86_64 += $(my_c_src)
LOCAL_SRC_FILES_mips64 += $(my_c_src)
-LOCAL_SHARED_LIBRARIES += libdl
-
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -91,8 +88,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/common_audio/vad/Android.mk b/src/common_audio/vad/Android.mk
index d13d571bae..c434e81647 100644
--- a/src/common_audio/vad/Android.mk
+++ b/src/common_audio/vad/Android.mk
@@ -44,7 +44,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -53,8 +52,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
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 c7a153f314..151138bdf3 100644
--- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -75,13 +75,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl
-
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -90,9 +83,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
@@ -129,7 +119,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -138,9 +127,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
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 d8e685f19d..12e4b0c528 100644
--- a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -1,8 +1,16 @@
-LOCAL_PATH := $(call my-dir)
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
###########################
# isac test app
+LOCAL_PATH := $(call my-dir)
+
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
@@ -46,9 +54,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_isac_test
-ifdef NDK_ROOT
-include $(BUILD_EXECUTABLE)
-else
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -59,4 +64,3 @@ LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
LOCAL_SHARED_LIBRARIES :=
endif
include $(BUILD_NATIVE_TEST)
-endif
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 98a0389152..d96c163928 100644
--- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk
@@ -65,11 +65,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../.. \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl
-
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -78,8 +73,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk
index 8f6bddee9e..a63cbd6a63 100644
--- a/src/modules/audio_processing/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -61,7 +61,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
include external/stlport/libstlport.mk
else
@@ -69,9 +68,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
@@ -118,10 +114,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_apm_process_test
-ifdef NDK_ROOT
-LOCAL_SHARED_LIBRARIES += libstlport
-include $(BUILD_EXECUTABLE)
-else
ifndef WEBRTC_STL
include external/stlport/libstlport.mk
else
@@ -130,7 +122,6 @@ LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
include $(BUILD_NATIVE_TEST)
-endif
# apm unit test app
@@ -179,10 +170,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= webrtc_apm_unit_test
-ifdef NDK_ROOT
-LOCAL_SHARED_LIBRARIES += libstlport
-include $(BUILD_EXECUTABLE)
-else
ifndef WEBRTC_STL
include external/stlport/libstlport.mk
else
@@ -191,4 +178,3 @@ LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
include $(BUILD_NATIVE_TEST)
-endif
diff --git a/src/modules/audio_processing/aec/Android.mk b/src/modules/audio_processing/aec/Android.mk
index ee72c8e4d7..f4d9e16989 100644
--- a/src/modules/audio_processing/aec/Android.mk
+++ b/src/modules/audio_processing/aec/Android.mk
@@ -46,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -55,8 +54,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk
index fff8f52a98..c0b6fd5ab7 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -46,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -55,9 +54,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
@@ -89,7 +85,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -98,9 +93,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk
index f9e1b0e445..21e943ffc6 100644
--- a/src/modules/audio_processing/agc/Android.mk
+++ b/src/modules/audio_processing/agc/Android.mk
@@ -43,7 +43,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -52,8 +51,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk
index 3043e7cc05..4494ac0051 100644
--- a/src/modules/audio_processing/ns/Android.mk
+++ b/src/modules/audio_processing/ns/Android.mk
@@ -48,7 +48,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -57,9 +56,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
@@ -91,7 +87,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -100,9 +95,6 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/src/modules/audio_processing/utility/Android.mk b/src/modules/audio_processing/utility/Android.mk
index 60a66868ee..4d86d16fac 100644
--- a/src/modules/audio_processing/utility/Android.mk
+++ b/src/modules/audio_processing/utility/Android.mk
@@ -43,7 +43,6 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -52,8 +51,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk
index 4b928b6a91..ce2555be64 100644
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -58,11 +58,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/spreadsortlib
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl
-
-ifndef NDK_ROOT
ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -71,8 +66,5 @@ LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
endif
-else
-LOCAL_SHARED_LIBRARIES += libstlport
-endif
include $(BUILD_STATIC_LIBRARY)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 16:56:10 +0000