diff --git a/jni/Application.mk b/jni/Application.mk index 71a4a2021..36fe8b7fc 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -95,7 +95,7 @@ APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility lib APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon endif -ifneq ($(BUILD_WEBRTC_ISAC), 0) +ifeq ($(BUILD_WEBRTC_ISAC), 1) APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmsisac APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon endif diff --git a/submodules/externals/build/msisac/Android.mk b/submodules/externals/build/msisac/Android.mk new file mode 100755 index 000000000..5e978ec38 --- /dev/null +++ b/submodules/externals/build/msisac/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libmsisac-linphone +LOCAL_MODULE_FILENAME := libmsisac-linphone-$(TARGET_ARCH) +LOCAL_SRC_FILES := $(TARGET_ARCH)/libmsisac-linphone-$(TARGET_ARCH).so + +include $(PREBUILT_SHARED_LIBRARY) diff --git a/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk b/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk index 0c04ebea3..62a4583e3 100644 --- a/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk +++ b/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk @@ -18,14 +18,36 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_spl LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ + auto_corr_to_refl_coef.c \ + auto_correlation.c \ complex_fft.c \ + copy_set_operations.c \ cross_correlation.c \ division_operations.c \ + dot_product_with_scale.c \ downsample_fast.c \ + energy.c \ + filter_ar.c \ + filter_ma_fast_q12.c \ + get_hanning_window.c \ + get_scaling_square.c \ + ilbc_specific_functions.c \ + levinson_durbin.c \ + lpc_to_refl_coef.c \ min_max_operations.c \ randomization_functions.c \ real_fft.c \ + refl_coef_to_lpc.c \ + resample.c \ + resample_48khz.c \ + resample_by_2.c \ + resample_by_2_internal.c \ + resample_fractional.c \ spl_init.c \ + spl_sqrt.c \ + spl_version.c \ + splitting_filter.c \ + sqrt_of_one_minus_x_squared.c \ vector_scaling_operations.c # Flags passed to both C and C++ files. @@ -36,6 +58,13 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../.. +ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) +LOCAL_SRC_FILES += \ + filter_ar_fast_q12_armv7.s +else +LOCAL_SRC_FILES += \ + filter_ar_fast_q12.c +endif ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES += \ complex_bit_reverse_arm.s \