Skip to content

Commit dfb3b5f

Browse files
committed
Update build scripts
- migrate repo from svn to git - since we bump ndk to r27, then we can remove deprecated NDK patches - set minSdkVersion to 24
1 parent e98646f commit dfb3b5f

14 files changed

+292
-169
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This project is based on [facebook/android-jsc](https://github.com/facebook/andr
1919
* Set `export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin`
2020
* Android NDK r19c: download from [NDK Archives](https://developer.android.com/ndk/downloads/older_releases.html)
2121
* Set `export ANDROID_NDK=/path/to/android-ndk-r19c`
22-
* Make sure you have Ruby (>2.3), Python (>2.7), Git, SVN, gperf
22+
* Make sure you have Ruby (>2.3), Python (>2.7), Git, gperf
2323

2424
## Build instructions
2525

@@ -235,7 +235,7 @@ packagingOptions {
235235
```
236236

237237
## Resources
238-
- [WebkitGTK Sources](https://svn.webkit.org/repository/webkit/releases/WebKitGTK/)
238+
- [WebKit Sources](https://github.com/WebKit/WebKit)
239239
- [ICU Sources](https://android.googlesource.com/platform/external/icu/)
240240
- [Info about Webkit Revisions](https://trac.webkit.org/browser/webkit/releases/WebKitGTK)
241241
- [Info about JSC version used on iOS](https://trac.webkit.org/browser/webkit/releases/WebKitGTK/webkit-2.18.2/Source/WebCore/Configurations/Version.xcconfig)

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsc-android",
3-
"version": "250231.0.0",
3+
"version": "2026004.0.0",
44
"description": "Pre-build version of JavaScriptCore to be used by React Native apps",
55
"repository": {
66
"type": "git",
@@ -26,12 +26,12 @@
2626
"start": "./scripts/start.sh"
2727
},
2828
"config": {
29-
"webkitGTK": "2.26.1",
29+
"webkitGTK": "2.26.4",
3030
"chromiumICUCommit": "64e5d7d43a1ff205e3787ab6150bbc1a1837332b"
3131
},
3232
"devDependencies": {
33-
"commander": "^4.0.1",
34-
"rimraf": "^3.0.0",
35-
"semver": "^6.3.0"
33+
"commander": "^12.1.0",
34+
"rimraf": "^6.0.1",
35+
"semver": "^7.6.3"
3636
}
3737
}

patches/jsc_fix_build_error_getline.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

patches/jsc_fix_build_error_log2.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

patches/jsc_fix_build_error_memalign.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.

patches/jsc_fix_build_error_mulodi4.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

patches/jsc_fix_concurrent_gc_issue.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
+ * runtime/ConcurrentJSLock.h:
3939
+ (JSC::ConcurrentJSLocker::ConcurrentJSLocker):
4040
+
41-
2019-09-18 Saam Barati <sbarati@apple.com>
41+
2020-03-09 Caio Lima <ticaiolima@gmail.com>
4242

43-
Phantom insertion phase may disagree with arguments forwarding about live ranges
43+
Tail calls are broken on ARM_THUMB2 and MIPS
4444
--- target-org/webkit/Source/JavaScriptCore/runtime/ConcurrentJSLock.h 2018-12-19 20:41:11.000000000 -0800
4545
+++ target/webkit/Source/JavaScriptCore/runtime/ConcurrentJSLock.h 2019-10-21 11:43:39.000000000 -0700
4646
@@ -32,13 +32,8 @@
@@ -110,9 +110,9 @@
110110
+
111111
+ * wtf/Platform.h:
112112
+
113-
2019-09-20 Libor Bukata <libor.bukata@oracle.com>
113+
2020-01-28 Carlos Garcia Campos <cgarcia@igalia.com>
114114

115-
UI process crash when using callOnMainThread() after the main thread dispatcher has been destroyed
115+
[GTK] Should use light theme unless website declares support for dark themes in color-schemes property
116116
--- target-org/webkit/Source/WTF/wtf/Platform.h 2019-08-23 14:21:51.000000000 -0700
117117
+++ target/webkit/Source/WTF/wtf/Platform.h 2019-10-21 11:44:30.000000000 -0700
118118
@@ -840,7 +840,7 @@

patches/ndkr23.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

scripts/compile/jsc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,5 @@ cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_DIR_I18N/$JN
9494
$TOOLCHAIN_DIR/bin/llvm-strip $INSTALL_DIR_I18N/$JNI_ARCH/libjsc.so
9595
mv $TARGETDIR/webkit/WebKitBuild $TARGETDIR/webkit/${CROSS_COMPILE_PLATFORM}-${FLAVOR}
9696

97-
cp $TOOLCHAIN_DIR/sysroot/usr/lib/$CROSS_COMPILE_PLATFORM/libc++_shared.so $INSTALL_CPPRUNTIME_DIR
97+
mkdir -p $INSTALL_CPPRUNTIME_DIR/$JNI_ARCH
98+
cp $TOOLCHAIN_DIR/sysroot/usr/lib/$CROSS_COMPILE_PLATFORM/libc++_shared.so $INSTALL_CPPRUNTIME_DIR/$JNI_ARCH/libc++_shared.so

scripts/download.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
# download sources
44
rm -rf $PWD/build
55
TARGET_DIR=$PWD/build/download
6-
SVN_URL="releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}"
6+
REPO_URL="https://github.com/WebKit/WebKit.git"
77

8-
mkdir -p $TARGET_DIR/webkit
9-
svn export https://svn.webkit.org/repository/webkit/$SVN_URL/Source $TARGET_DIR/webkit/Source
10-
svn export https://svn.webkit.org/repository/webkit/$SVN_URL/Tools $TARGET_DIR/webkit/Tools
11-
svn export https://svn.webkit.org/repository/webkit/$SVN_URL/CMakeLists.txt $TARGET_DIR/webkit/CMakeLists.txt
8+
mkdir -p $TARGET_DIR
9+
# FIXME: hardcoded branch because WebKitGTK 2.26 does not have tag
10+
git clone $REPO_URL --branch 'webkitgtk/2.26' --depth 1 $TARGET_DIR/webkit
1211

1312
mkdir -p $TARGET_DIR/icu
1413
curl "https://chromium.googlesource.com/chromium/deps/icu/+archive/${npm_package_config_chromiumICUCommit}.tar.gz" | tar xzf - -C $TARGET_DIR/icu

0 commit comments

Comments
 (0)