Reapply "Fix OHOS define" #671
Merged
Conversation
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
* Fix OHOS define Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Fix indentation Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Avoid name collision by not importing header Assertions .h is also included in `c` files, so using namespaces is not an option to avoid the collision. js::LogLevel, collides with the hilog LogLevel enum. Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Fix vprintf impl Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Update patches Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Bump mozjs version Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * Completely inline function declaration Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * ohos: Add debug-mozjs ci configuration Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> --------- Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> (cherry picked from commit dfae36e)
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
Compiling the unit-tests assures, that linking succeeds. Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
mukilan
reviewed
Nov 25, 2025
mozjs-sys/etc/patches/0036-Redirect_errors_to_hilog_on_OpenHarmony.patch
Show resolved
Hide resolved
Not needed anymore, since we don't include this file. Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
mukilan
approved these changes
Nov 26, 2025
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Nov 26, 2025
Companion PR to servo/mozjs#671 Fixes issues with ohos related patches in spidermonkey, specifically when compiling servo with --debug-mozjs. Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Nov 26, 2025
Companion PR to servo/mozjs#671 Fixes issues with ohos related patches in spidermonkey, specifically when compiling servo with --debug-mozjs. Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Nov 27, 2025
Companion PR to servo/mozjs#671 Fixes issues with ohos related patches in spidermonkey, specifically when compiling servo with --debug-mozjs. Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This PR re-applies #666, which was reverted due to linking failing.
The original issue was that when declaring the function
OH_LOG_Print__attribute__((visibility("default")))needs to be added, since (parts of) mozjs are compiled with-fvisibility=hidden.To catch such issues in CI in the future, this PR also adds a final step to the ohos CI which compiles the unit-tests, which will invoke the linker, and thus catch similar link errors in our CI.
Companion PR in servo: servo/servo#40855