Skip to content

Fix building Android on Windows #39190

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

Closed
alespergl wants to merge 1 commit into from
Closed

Fix building Android on Windows #39190

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
5 changes: 5 additions & 0 deletions packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ set(CMAKE_VERBOSE_MAKEFILE on)

project(ReactAndroid)

# Convert input paths to CMake format (with forward slashes)
file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR)
file(TO_CMAKE_PATH "${REACT_BUILD_DIR}" REACT_BUILD_DIR)
file(TO_CMAKE_PATH "${REACT_COMMON_DIR}" REACT_COMMON_DIR)
Comment on lines +11 to +14
Copy link
Contributor

@cipolleschi cipolleschi Aug 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alespergl I'm not an expert of CMake, but can we wrap this change in a platform check?
Something like:

if(${CMAKE_SYSTEM_NAME} MATCHES "Win32") 
  file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR)
	file(TO_CMAKE_PATH "${REACT_BUILD_DIR}" REACT_BUILD_DIR)
	file(TO_CMAKE_PATH "${REACT_COMMON_DIR}" REACT_COMMON_DIR)
endif

I'm scared this could cause harm on other systems, otherwise.

Copy link
Contributor

@cortinico cortinico Sep 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using file(TO_CMAKE_PATH should actually be correct on every platform.
As the CI is green, we can just merge it 👍

Copy link
Contributor Author

@alespergl alespergl Sep 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this operation should be cross-platform.

Note: There is a similar function cmake_path which seems to be preferred, but requires CMake 3.20 or later, whereas the minimum specified in this CMakeLists.txt is 3.13.


# If you have ccache installed, we're going to honor it.
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
Expand Down