Fix JS_RUNTIME_HERMES flag definition
#6838
Open
+14
−27
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
tomekzaw
approved these changes
Dec 19, 2024
Comment on lines
3
to
4
| // JS_RUNTIME_HERMES is only set on Android so we have to check __has_include | ||
| // on iOS. |
There was a problem hiding this comment.
Let's mention in the comment that on Android, JS_RUNTIME_HERMES is set in CMakeLists.txt. On iOS, there's no simple way to detect if Hermes is enabled or not, so we check the existence of the header file.
| #include <jsi/decorator.h> | ||
| #include <jsi/jsi.h> | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
| #include <utility> | ||
|
|
||
| #if __has_include(<reacthermes/HermesExecutorFactory.h>) | ||
| #include <reacthermes/HermesExecutorFactory.h> |
There was a problem hiding this comment.
Can you please confirm in which version of RN HermesExecutorFactory.h file was removed?
There was a problem hiding this comment.
Actually, both files exist, but #include <hermes/hermes.h> is all we need to use. I've run compatibility tests on CI, and this change appears to be safe (expect one flaky check)
piaskowyk
added
the
Check compatibility
|
I've also tested it with JSC, and it works properly 👍 |
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
This PR streamlines the definition of the
JS_RUNTIME_HERMESflag. Previously, the flag wasn't consistently defined across all usage points (which prevented the compilation of certain branches of code - for example in WorkletsModuleProxy.cpp), and it also had duplicated definitions. Additionally, I've removed outdated and unnecessary checks from the flag definition.Test plan