-
Notifications
You must be signed in to change notification settings - Fork 97
Upgrade to WebKitGTK 2.36.3 #169
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| rootProject.name = 'JavaScriptCore Lib' | ||
|
|
||
| include ':android-jsc' | ||
| include ':cppruntime' |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,34 @@ | ||
| diff -aur target-org/webkit/CMakeLists.txt target/webkit/CMakeLists.txt | ||
| --- target-org/webkit/CMakeLists.txt 2017-12-22 19:18:43.000000000 +0200 | ||
| +++ target/webkit/CMakeLists.txt 2018-06-14 15:41:59.000000000 +0300 | ||
| @@ -177,13 +177,13 @@ | ||
| --- target-org/webkit/CMakeLists.txt 2021-03-06 03:12:45.000000000 +0800 | ||
| +++ target/webkit/CMakeLists.txt 2022-07-09 18:13:01.000000000 +0800 | ||
| @@ -38,9 +38,9 @@ | ||
| add_subdirectory(Tools) | ||
| endif () | ||
|
|
||
| -if ("${PORT}" STREQUAL "GTK" OR "${PORT}" STREQUAL "WPE") | ||
| - if (DEVELOPER_MODE) | ||
| - add_subdirectory(PerformanceTests) | ||
| - endif () | ||
| -else () | ||
|
|
||
| -if (DEVELOPER_MODE) | ||
| - add_subdirectory(PerformanceTests) | ||
| -endif () | ||
| +#if ("${PORT}" STREQUAL "GTK" OR "${PORT}" STREQUAL "WPE") | ||
| +# if (DEVELOPER_MODE) | ||
| +# add_subdirectory(PerformanceTests) | ||
| +# endif () | ||
| +#else () | ||
| +# add_subdirectory(PerformanceTests) | ||
| +#endif () | ||
|
|
||
| +# if (DEVELOPER_MODE) | ||
| +# add_subdirectory(PerformanceTests) | ||
| +# endif () | ||
|
|
||
| # ----------------------------------------------------------------------------- | ||
| # Print the features list last, for maximum visibility. | ||
| diff -aur target-org/webkit/Source/cmake/OptionsJSCOnly.cmake target/webkit/Source/cmake/OptionsJSCOnly.cmake | ||
| --- target-org/webkit/Source/cmake/OptionsJSCOnly.cmake 2019-03-26 11:25:17.000000000 +0800 | ||
| +++ target/webkit/Source/cmake/OptionsJSCOnly.cmake 2019-03-26 11:28:29.000000000 +0800 | ||
| @@ -35,12 +35,7 @@ | ||
| set(ENABLE_WEBCORE OFF) | ||
| set(ENABLE_WEBKIT_LEGACY OFF) | ||
| set(ENABLE_WEBKIT OFF) | ||
| - | ||
| -if (WIN32) | ||
| - set(ENABLE_API_TESTS OFF) | ||
| -else () | ||
| --- target-org/webkit/Source/cmake/OptionsJSCOnly.cmake 2022-07-09 15:31:32.000000000 +0800 | ||
| +++ target/webkit/Source/cmake/OptionsJSCOnly.cmake 2022-07-09 15:29:24.000000000 +0800 | ||
| @@ -47,7 +47,7 @@ | ||
| if (WIN32) | ||
| set(ENABLE_API_TESTS OFF) | ||
| else () | ||
| - set(ENABLE_API_TESTS ON) | ||
| -endif () | ||
| +set(ENABLE_API_TESTS OFF) | ||
|
|
||
| + set(ENABLE_API_TESTS OFF) | ||
| endif () | ||
| if (WTF_CPU_ARM OR WTF_CPU_MIPS) | ||
| SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE TRUE) | ||
| diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/Source/JavaScriptCore/CMakeLists.txt | ||
| --- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt 2017-05-02 21:13:03.000000000 +0200 | ||
| +++ target/webkit/Source/JavaScriptCore/CMakeLists.txt 2017-07-11 11:34:55.962374878 +0200 | ||
| @@ -1291,7 +1291,7 @@ | ||
| ) | ||
| target_include_directories(LLIntOffsetsExtractor SYSTEM PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
|
|
||
| --- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt 2022-07-09 15:31:21.000000000 +0800 | ||
| +++ target/webkit/Source/JavaScriptCore/CMakeLists.txt 2022-07-09 15:31:50.000000000 +0800 | ||
| @@ -1564,4 +1565,4 @@ | ||
| VERBATIM) | ||
| endif () | ||
|
|
||
| -add_subdirectory(shell) | ||
| +# add_subdirectory(shell) | ||
|
|
||
| WEBKIT_COMPUTE_SOURCES(JavaScriptCore) | ||
| WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES}) | ||
|
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this necessary, can you clarify what was the error? Does it mean that building jsc will not work locally? And if it works locally, then it should be possible to make it work on ci without this patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from NDK r22, the icu headers are builtin inside NDK. when building icu, the includes such as
#include "unicode/utypes.h"will access to NDK headers first and lead to build errors.i also need to move out the
unicode/folder from NDK when building locally.