aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk41
-rw-r--r--src/common_audio/resampler/Android.mk15
-rw-r--r--src/common_audio/signal_processing/Android.mk14
-rw-r--r--src/common_audio/vad/Android.mk15
-rw-r--r--src/modules/audio_coding/codecs/isac/fix/source/Android.mk32
-rw-r--r--src/modules/audio_coding/codecs/isac/main/source/Android.mk15
-rw-r--r--src/modules/audio_processing/Android.mk28
-rw-r--r--src/modules/audio_processing/aec/Android.mk14
-rw-r--r--src/modules/audio_processing/aecm/Android.mk23
-rw-r--r--src/modules/audio_processing/agc/Android.mk13
-rw-r--r--src/modules/audio_processing/ns/Android.mk25
-rw-r--r--src/modules/audio_processing/utility/Android.mk13
-rw-r--r--src/system_wrappers/source/Android.mk15
13 files changed, 35 insertions, 228 deletions
diff --git a/Android.mk b/Android.mk
index e5a9a74bd5..7b046d67af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,13 +23,6 @@ include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk
-# libwebrtc_audio_coding_gnustl_static dependencies
-WEBRTC_STL := gnustl_static
-include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk
-
# build .so
LOCAL_PATH := $(call my-dir)
@@ -74,7 +67,6 @@ include external/stlport/libstlport.mk
endif
include $(BUILD_SHARED_LIBRARY)
-
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk
@@ -87,6 +79,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwebrtc_isacfix \
libwebrtc_spl \
libwebrtc_system_wrappers
+
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_WHOLE_STATIC_LIBRARIES += \
libwebrtc_isacfix_neon
@@ -94,6 +87,7 @@ endif
LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite
+
LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl \
@@ -105,34 +99,3 @@ ifndef NDK_ROOT
include external/stlport/libstlport.mk
endif
include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc_audio_coding_gnustl_static
-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 += \
- libwebrtc_isacfix_neon_gnustl
-endif
-
-LOCAL_STATIC_LIBRARIES := \
- libprotobuf-cpp-2.3.0-lite
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_NDK_STL_VARIANT := gnustl_static
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/src/common_audio/resampler/Android.mk b/src/common_audio/resampler/Android.mk
index 8238eb58bf..b1d630aa23 100644
--- a/src/common_audio/resampler/Android.mk
+++ b/src/common_audio/resampler/Android.mk
@@ -26,11 +26,12 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../signal_processing/include
+ $(LOCAL_PATH)/../signal_processing/include
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread
@@ -41,16 +42,6 @@ LOCAL_SHARED_LIBRARIES += libdl
endif
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 142a66e6c1..a056e7e489 100644
--- a/src/common_audio/signal_processing/Android.mk
+++ b/src/common_audio/signal_processing/Android.mk
@@ -55,7 +55,7 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../..
+ $(LOCAL_PATH)/../..
ifeq ($(ARCH_ARM_HAVE_NEON),true)
LOCAL_SRC_FILES += \
@@ -72,6 +72,8 @@ LOCAL_SRC_FILES += \
spl_sqrt_floor.c
endif
+LOCAL_SHARED_LIBRARIES := libstlport
+
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread
endif
@@ -81,16 +83,6 @@ LOCAL_SHARED_LIBRARIES += libdl
endif
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 6cacbdb940..b7be3f0307 100644
--- a/src/common_audio/vad/Android.mk
+++ b/src/common_audio/vad/Android.mk
@@ -30,10 +30,11 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../.. \
- $(LOCAL_PATH)/../signal_processing/include
+ $(LOCAL_PATH)/../signal_processing/include
LOCAL_SHARED_LIBRARIES := \
- libdl
+ libdl \
+ libstlport
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread
@@ -44,16 +45,6 @@ LOCAL_SHARED_LIBRARIES += libdl
endif
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 b47a4a5407..bd95ed8125 100644
--- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -69,21 +69,12 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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)
#########################
@@ -113,19 +104,10 @@ 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
-else
-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)
@@ -164,13 +146,5 @@ LOCAL_MODULE:= webrtc_isac_test
ifdef NDK_ROOT
include $(BUILD_EXECUTABLE)
else
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
-include external/stlport/libstlport.mk
-else
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-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 bacd15192b..07b2a314b5 100644
--- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk
@@ -53,23 +53,14 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../../../.. \
- $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
+ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 4f2979fce6..9ca2aeedf3 100644
--- a/src/modules/audio_processing/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -52,20 +52,12 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
include external/stlport/libstlport.mk
-else
-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)
# apm process test app
@@ -95,21 +87,15 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
libutils \
+ libstlport \
libwebrtc_audio_preprocessing
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
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-LOCAL_SDK_VERSION := 14
-LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
-endif
include $(BUILD_NATIVE_TEST)
endif
@@ -144,20 +130,14 @@ LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite
LOCAL_SHARED_LIBRARIES := \
+ libstlport \
libwebrtc_audio_preprocessing
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
-LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
-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 8eebf6c494..698755acdb 100644
--- a/src/modules/audio_processing/aec/Android.mk
+++ b/src/modules/audio_processing/aec/Android.mk
@@ -36,20 +36,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
-
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 5d238fb5a9..10c38ca501 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -37,21 +37,12 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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)
#########################
@@ -80,18 +71,8 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk
index 1e8969b721..546128d45d 100644
--- a/src/modules/audio_processing/agc/Android.mk
+++ b/src/modules/audio_processing/agc/Android.mk
@@ -31,19 +31,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 d7149e60c6..255f4709cb 100644
--- a/src/modules/audio_processing/ns/Android.mk
+++ b/src/modules/audio_processing/ns/Android.mk
@@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \
nsx_core.c
# Files for floating point.
-# noise_suppression.c ns_core.c
+# noise_suppression.c ns_core.c
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
@@ -39,21 +39,12 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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)
#############################
@@ -82,17 +73,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../common_audio/signal_processing/include
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 8ca12817db..bd3d039eeb 100644
--- a/src/modules/audio_processing/utility/Android.mk
+++ b/src/modules/audio_processing/utility/Android.mk
@@ -34,19 +34,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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 923a2fb633..dee84ca294 100644
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES := \
sleep.cc \
thread_posix.cc \
trace_posix.cc \
- rw_lock_posix.cc
+ rw_lock_posix.cc
LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS)
@@ -53,19 +53,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libdl
+ libdl \
+ libstlport
ifndef NDK_ROOT
-ifndef WEBRTC_STL
-LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
-else
-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-07-07 21:42:19 +0000