[android] More robust hermes-engine lookup logic in makefiles#26820
Closed
ide wants to merge 1 commit into
Closed
Conversation
The Android makefiles had hard-coded paths to hermes-engine, sometimes looking in `node_modules` and other times looking in `..`. This commit implements the Node module resolution algorithm (see common.mk), which handles both of these cases and also looks further up the root if necessary, handling the case when the `hermes-engine` npm package is hoisted. This commit does three things: - Defines `find-node-module` and uses it in the makefiles to find `hermes-engine` - Removes the unused `/path/to/hermes-engine/include` paths since this directory does not exist and should be `/path/to/hermes-engine/android/include` (`android`) - Moves the definition of `REACT_NATIVE` in the makefiles to the top. It was defined after every `$(CLEAR_VARS)` invocation but was not actually cleared anyway. `$(CLEAR_VARS)` resets only `LOCAL_*` variables in this list: https://android.googlesource.com/platform/build/+/7dc45a8/core/clear_vars.mk Test Plan: Run `./gradlew :ReactAndroid:installArchives`, which requires the hermes-engine paths to be correct in order to find the headers.
facebook-github-bot
added
p: Expo
facebook-github-bot
approved these changes
Oct 15, 2019
Contributor
facebook-github-bot
left a comment
facebook-github-bot
left a comment
There was a problem hiding this comment.
@cpojer is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
Collaborator
|
This pull request was successfully merged by @ide in df653a9. When will my fix make it into a release? | Upcoming Releases |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
The Android makefiles had hard-coded paths to hermes-engine, sometimes looking in
node_modulesand other times looking in... This commit implements the Node module resolution algorithm (see common.mk), which handles both of these cases and also looks further up the root if necessary, handling the case when thehermes-enginenpm package is hoisted.This commit does three things:
find-node-moduleand uses it in the makefiles to findhermes-engine/path/to/hermes-engine/includepaths since this directory does not exist and should be/path/to/hermes-engine/android/include(android)REACT_NATIVEin the makefiles to the top. It was defined after every$(CLEAR_VARS)invocation but was not actually cleared anyway.$(CLEAR_VARS)resets onlyLOCAL_*variables in this list: https://android.googlesource.com/platform/build/+/7dc45a8/core/clear_vars.mkChangelog
[Internal] [Changed] - Android Makefiles look for hermes-engine using Node's module resolution algorithm
Test Plan
Run
./gradlew :ReactAndroid:installArchives, which requires the hermes-engine paths to be correct in order to find the headers.