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: Prioritise local cpp (use default as fallback) #48340

Closed
wants to merge 2 commits into from
Closed

fix: Prioritise local cpp (use default as fallback) #48340

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aefc201
Prioritise local cpp (use default as fallback)
timbocole Dec 19, 2024
3048899
Update packages/react-native/ReactAndroid/cmake-utils/ReactNative-app…
cortinico Dec 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: 13 additions & 3 deletions packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,19 @@ if (PROJECT_ROOT_DIR)
# variable is defined if user need to access it.
endif ()

file(GLOB input_SRC CONFIGURE_DEPENDS
${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
file(GLOB override_cpp_SRC CONFIGURE_DEPENDS *.cpp)
# We check if the user is providing a custom OnLoad.cpp file. If so, we pick that
# for compilation. Otherwise we fallback to using the `default-app-setup/OnLoad.cpp`
# file instead.
if(override_cpp_SRC)
cortinico marked this conversation as resolved.
Show resolved Hide resolved
file(GLOB input_SRC CONFIGURE_DEPENDS
*.cpp
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
else()
file(GLOB input_SRC CONFIGURE_DEPENDS
${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
endif()

add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})

Expand Down
Loading