Merge branch 'main' of github.com:software-mansion-labs/react-native-…

…audio-api
software-mansion-labs · Nov 26, 2024 · 4199cef · 4199cef
2 parents cac48c2 + a89736f
commit 4199cef
Show file tree

Hide file tree

Showing 7 changed files with 429 additions and 22 deletions.
diff --git a/packages/react-native-audio-api/android/CMakeLists.txt b/packages/react-native-audio-api/android/CMakeLists.txt
@@ -35,8 +35,6 @@ file(GLOB_RECURSE SOURCE_FILES
   "../common/cpp/types/*.h"
 )
 
-add_subdirectory(../external/kfr ${CMAKE_CURRENT_BINARY_DIR}/kfr-build)
-
 add_library(react-native-audio-api SHARED ${SOURCE_FILES})
 
 file(GLOB DIRS CONFIGURE_DEPENDS "src/main/cpp/**" "../common/cpp/**")
@@ -48,8 +46,11 @@ target_include_directories(
   "${REACT_NATIVE_DIR}/ReactCommon/jsi"
   "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/jni"
   "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/third-party/folly"
+  "${CMAKE_CURRENT_SOURCE_DIR}/libs/include/fftw3"
 )
 
+set(fftw3 ${CMAKE_CURRENT_SOURCE_DIR}/libs/fftw3/${ANDROID_ABI}/libfftw3.a)
+
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 find_package(oboe REQUIRED CONFIG)
@@ -60,10 +61,7 @@ set(LINK_LIBRARIES
   android
   log
   oboe::oboe
-  kfr
-  kfr_dsp
-  kfr_dft
-  kfr_io
+  ${fftw3}
 )
 
 if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)

diff --git a/packages/react-native-audio-api/android/libs/fftw3/arm64-v8a/libfftw3.a b/packages/react-native-audio-api/android/libs/fftw3/arm64-v8a/libfftw3.a
diff --git a/packages/react-native-audio-api/android/libs/fftw3/armeabi-v7a/libfftw3.a b/packages/react-native-audio-api/android/libs/fftw3/armeabi-v7a/libfftw3.a
diff --git a/packages/react-native-audio-api/android/libs/fftw3/x86/libfftw3.a b/packages/react-native-audio-api/android/libs/fftw3/x86/libfftw3.a
diff --git a/packages/react-native-audio-api/android/libs/fftw3/x86_64/libfftw3.a b/packages/react-native-audio-api/android/libs/fftw3/x86_64/libfftw3.a