Skip to content

Commit e57ec29

Browse files
committed
Revert "fix: Prioritise local cpp (use default as fallback) (facebook#48340)"
This reverts commit e6374c6.
1 parent e89f28e commit e57ec29

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,9 @@ set(BUILD_DIR ${PROJECT_BUILD_DIR})
3434
file(TO_CMAKE_PATH "${BUILD_DIR}" BUILD_DIR)
3535
file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR)
3636

37-
if (PROJECT_ROOT_DIR)
38-
# This empty `if` is just to silence a CMake warning and make sure the `PROJECT_ROOT_DIR`
39-
# variable is defined if user need to access it.
40-
endif ()
41-
42-
file(GLOB override_cpp_SRC CONFIGURE_DEPENDS *.cpp)
43-
# We check if the user is providing a custom OnLoad.cpp file. If so, we pick that
44-
# for compilation. Otherwise we fallback to using the `default-app-setup/OnLoad.cpp`
45-
# file instead.
46-
if(override_cpp_SRC)
47-
file(GLOB input_SRC CONFIGURE_DEPENDS
48-
*.cpp
49-
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
50-
else()
51-
file(GLOB input_SRC CONFIGURE_DEPENDS
52-
${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
53-
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
54-
endif()
37+
file(GLOB input_SRC CONFIGURE_DEPENDS
38+
${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
39+
${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
5540

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

0 commit comments

Comments
 (0)