Skip to content
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

fix: [email protected] Android compatibility #84

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −2
Open

fix: [email protected] Android compatibility #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6af5fb
fix: [email protected] Android compatibility
Oct 25, 2024
f3ecf21
chore: proper target_link_libraries
Oct 31, 2024
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
16 changes: 14 additions & 2 deletions android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
# Consume shared libraries and headers from prefabs
find_package(ReactAndroid REQUIRED CONFIG)
find_package(fbjni REQUIRED CONFIG)

include_directories(
${PACKAGE_NAME}
Expand Down Expand Up @@ -49,15 +50,26 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)

find_package(openssl REQUIRED CONFIG)

target_link_libraries(
if (REACTNATIVE_MERGED_SO OR ${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 76)
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
openssl::crypto
)
else()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::jsi
ReactAndroid::reactnativejni
ReactAndroid::react_nativemodule_core
android
openssl::crypto
)
)
endif()
else()
add_library(
${PACKAGE_NAME}
Expand Down
Loading