Use absolute path when compiling appmodules.so sources #47379
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
CLA Signed
|
@cortinico has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
This was referenced Nov 4, 2024
|
@cortinico merged this pull request in 3956955. |
|
This pull request was successfully merged by @cortinico in 3956955 When will my fix make it into a release? | How to file a pick request? |
blakef
pushed a commit
that referenced
this pull request
Nov 12, 2024
Summary: Fixes #47352 This fixes a bug when the user is providing its own CMakeLists.txt file say because they want to compile more C++ code than we actually provide. Previously the `*.cpp` will evalute file in the current directory, meaning that the app's default `OnLoad.cpp` file would be ignored. ## Changelog: [ANDROID] [FIXED] - Use absolute path when compiling appmodules.so sources Pull Request resolved: #47379 Test Plan: Tested against the reproducer provided in: - Use absolute path when compiling appmodules.so sources Reviewed By: cipolleschi Differential Revision: D65428676 Pulled By: cortinico fbshipit-source-id: 7f3e4d470da0fffc5191c1a2c7e8fec517fee496
facebook-github-bot
pushed a commit
that referenced
this pull request
Dec 31, 2024
Summary: #47379 removed local cpp sources from the sources being built with the app. This resulted in a local `android/app/src/main/jni/OnLoad.cpp` file being ignored at build time. I have therefore added logic to the cmake file to prioritise local `cpp` files and fallback to `${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp` if none exist. This resolves #48298 ## Changelog: [ANDROID] [FIXED] - Prioritise local OnLoad.cpp, falling back to default-app-setup Pull Request resolved: #48340 Test Plan: - Followed the https://reactnative.dev/docs/the-new-architecture/pure-cxx-modules guide (which was broken > 0.76.1) - Applied the patch to the reproduction repository linked to #47352 to ensure no regression Reviewed By: cipolleschi Differential Revision: D67736012 Pulled By: cortinico fbshipit-source-id: 87f6b8edf1613682585a94e1d1b3e6b4b792e4f5
robhogan
pushed a commit
that referenced
this pull request
Jan 6, 2025
Summary: #47379 removed local cpp sources from the sources being built with the app. This resulted in a local `android/app/src/main/jni/OnLoad.cpp` file being ignored at build time. I have therefore added logic to the cmake file to prioritise local `cpp` files and fallback to `${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp` if none exist. This resolves #48298 ## Changelog: [ANDROID] [FIXED] - Prioritise local OnLoad.cpp, falling back to default-app-setup Pull Request resolved: #48340 Test Plan: - Followed the https://reactnative.dev/docs/the-new-architecture/pure-cxx-modules guide (which was broken > 0.76.1) - Applied the patch to the reproduction repository linked to #47352 to ensure no regression Reviewed By: cipolleschi Differential Revision: D67736012 Pulled By: cortinico fbshipit-source-id: 87f6b8edf1613682585a94e1d1b3e6b4b792e4f5
cipolleschi
pushed a commit
that referenced
this pull request
Jan 8, 2025
Summary: #47379 removed local cpp sources from the sources being built with the app. This resulted in a local `android/app/src/main/jni/OnLoad.cpp` file being ignored at build time. I have therefore added logic to the cmake file to prioritise local `cpp` files and fallback to `${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp` if none exist. This resolves #48298 [ANDROID] [FIXED] - Prioritise local OnLoad.cpp, falling back to default-app-setup Pull Request resolved: #48340 Test Plan: - Followed the https://reactnative.dev/docs/the-new-architecture/pure-cxx-modules guide (which was broken > 0.76.1) - Applied the patch to the reproduction repository linked to #47352 to ensure no regression Reviewed By: cipolleschi Differential Revision: D67736012 Pulled By: cortinico fbshipit-source-id: 87f6b8edf1613682585a94e1d1b3e6b4b792e4f5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
Fixes #47352
This fixes a bug when the user is providing its own CMakeLists.txt file say because they want to compile more C++ code than we actually provide.
Previously the
*.cppwill evalute file in the current directory, meaning that the app's defaultOnLoad.cppfile would be ignored.Changelog:
[ANDROID] [FIXED] - Use absolute path when compiling appmodules.so sources
Test Plan:
Tested against the reproducer provided in: