Fix OHOS define #666
Merged
Fix OHOS define #666
+121
−82
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
jschwe
force-pushed
the
jschwender/fix-ohos-define
branch
from
880c396 to
f5b45b6
Compare
jdm
approved these changes
Nov 19, 2025
jschwe
force-pushed
the
jschwender/fix-ohos-define
branch
from
83f7fa6 to
32c419a
Compare
Signed-off-by: Jonathan Schwender <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
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 <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
jschwe
force-pushed
the
jschwender/fix-ohos-define
branch
from
32c419a to
79183e7
Compare
Signed-off-by: Jonathan Schwender <[email protected]>
Member
Author
|
Todo: add ci configuration for ohos with debugmozjs |
Signed-off-by: Jonathan Schwender <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
Member
Author
|
This PR did change a bit since the initial review, so it might make sense to be reviewed again. I'm not super happy with inlining the function declaration in every file it is used, but I don't think it would make the patching easier, if I wrapped the logging in a new header file. |
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.
Extracted from #583.
target_is_ohoswas not working as expected. This presumably originated in a seemingly harmless suggestion,but surprisingly the expected return type / values for these functions is
True | None, and notTrue | False(The other functions liketarget_is_xxdon't return anything explicitly if theifdoes not match, which results in aNoneimplicitly I guess). ReturningFalsedoes not give the expected result. I noticed this while working on #583 - normally logs are still visible in servo, since we setup a thread that redirects output from stdout / stderr to the logging system on ohos (except in production mode).Fixing the ohos define also revealed some issues with the patches:
LogLeveldefined inhilog/log.hcollides with aLogLevelin thejsnamespace. Some of the header files we included hilog in, have this collision, and are also used from C files, so we can't just namespace the import (without the patch getting quite ugly).To avoid these issues we just copy the function declaration, and use raw integers instead of the enum in the function signature.