Skip to content

fix(android): resolve two Windows build failures — bash path and CMake/Ninja absolute path #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinthelago wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −6
Open

fix(android): resolve two Windows build failures — bash path and CMake/Ninja absolute path #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/react-native-audio-api/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,14 @@ def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask {
}

task downloadPrebuiltBinaries(type: Exec) {
commandLine 'chmod', '+x', '../scripts/download-prebuilt-binaries.sh'
commandLine 'bash', '../scripts/download-prebuilt-binaries.sh'
args 'android', isFFmpegDisabled() ? 'skipffmpeg' : ''
def isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
if (isWindows) {
commandLine 'C:\\Program Files\\Git\\usr\\bin\\bash.exe', '../scripts/download-prebuilt-binaries.sh', 'android', isFFmpegDisabled() ? 'skipffmpeg' : ''
} else {
commandLine 'chmod', '+x', '../scripts/download-prebuilt-binaries.sh'
commandLine 'bash', '../scripts/download-prebuilt-binaries.sh'
args 'android', isFFmpegDisabled() ? 'skipffmpeg' : ''
}
}

// Make preBuild depend on the download task
Expand Down
19 changes: 16 additions & 3 deletions packages/react-native-audio-api/android/src/main/cpp/audioapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
cmake_minimum_required(VERSION 3.12.0)

file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "${ANDROID_CPP_DIR}/audioapi/*.cpp")
file(GLOB_RECURSE COMMON_CPP_SOURCES CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/*.cpp" "${COMMON_CPP_DIR}/audioapi/*.c")
file(GLOB_RECURSE DSP_CPP_SOURCES CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/dsp/*.cpp")
file(GLOB_RECURSE ANDROID_CPP_SOURCES_ABS CONFIGURE_DEPENDS "${ANDROID_CPP_DIR}/audioapi/*.cpp")
file(GLOB_RECURSE COMMON_CPP_SOURCES_ABS CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/*.cpp" "${COMMON_CPP_DIR}/audioapi/*.c")
file(GLOB_RECURSE DSP_CPP_SOURCES_ABS CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/dsp/*.cpp")

foreach(src IN LISTS ANDROID_CPP_SOURCES_ABS)
file(RELATIVE_PATH rel_src "${CMAKE_CURRENT_SOURCE_DIR}" "${src}")
list(APPEND ANDROID_CPP_SOURCES "${rel_src}")
endforeach()
foreach(src IN LISTS COMMON_CPP_SOURCES_ABS)
file(RELATIVE_PATH rel_src "${CMAKE_CURRENT_SOURCE_DIR}" "${src}")
list(APPEND COMMON_CPP_SOURCES "${rel_src}")
endforeach()
foreach(src IN LISTS DSP_CPP_SOURCES_ABS)
file(RELATIVE_PATH rel_src "${CMAKE_CURRENT_SOURCE_DIR}" "${src}")
list(APPEND DSP_CPP_SOURCES "${rel_src}")
endforeach()

if (RN_AUDIO_API_FFMPEG_DISABLED)
list(REMOVE_ITEM COMMON_CPP_SOURCES
Expand Down
Loading