WebKitGTK 2.26.1

1. Update patches for WebKitGTK 2.26
2. cmake upgrades to 3.10 for WebKit upstream mininal requirements
   changes and remove some patches for original WebKit FindICU.

Author: Kudo

.circleci/config.yml

@@ -45,13 +45,14 @@ jobs:
               rm -rf /tmp/android-ndk-tmp
             sdkmanager \
               "lldb;3.0" \
-              "cmake;3.6.4111459"
+              "cmake;3.10.2.4988404"
       - run:
           name: install subversion
           command: |
             sudo apt-get update
-            sudo apt-get install coreutils realpath curl git subversion python-dev ruby gperf -y
-            pyenv global 3.5.2
+            sudo apt-get install coreutils realpath curl git subversion python3.5 python3.5-dev ruby gperf -y
+            sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 1
+            pyenv global system
       - run:
           name: upgrade node
           command: |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsc-android",
-  "version": "245459.0.0",
+  "version": "250230.0.0",
   "description": "Pre-build version of JavaScriptCore to be used by React Native apps",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "start": "./scripts/start.sh"
   },
   "config": {
-    "webkitGTK": "2.24.2",
+    "webkitGTK": "2.26.1",
     "chromiumICUCommit": "64e5d7d43a1ff205e3787ab6150bbc1a1837332b"
   }
 }

patches/icu.patch

@@ -1,64 +1,12 @@
-diff -aur target-org/webkit/Source/cmake/FindICU.cmake target/webkit/Source/cmake/FindICU.cmake
---- target-org/webkit/Source/cmake/FindICU.cmake	2019-03-26 11:25:17.000000000 +0800
-+++ target/webkit/Source/cmake/FindICU.cmake	2019-03-26 11:30:34.000000000 +0800
-@@ -16,19 +16,15 @@
- find_path(
-     ICU_INCLUDE_DIR
-     NAMES unicode/utypes.h
--    HINTS ${PC_ICU_INCLUDE_DIRS}
--          ${PC_ICU_INCLUDEDIR}
--          ${WEBKIT_LIBRARIES_INCLUDE_DIR}
-+    HINTS ${WEBKIT_LIBRARIES_INCLUDE_DIR}
-     DOC "Include directory for the ICU library")
- mark_as_advanced(ICU_INCLUDE_DIR)
-
- # Look for the library.
- find_library(
-     ICU_LIBRARY
--    NAMES libicuuc cygicuuc cygicuuc32 icuuc
--    HINTS ${PC_ICU_LIBRARY_DIRS}
--          ${PC_ICU_LIBDIR}
--          ${WEBKIT_LIBRARIES_LINK_DIR}
-+    NAMES icuuc_jsc
-+    HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
-     DOC "Libraries to link against for the common parts of ICU")
- mark_as_advanced(ICU_LIBRARY)
-
-@@ -51,10 +47,8 @@
-     pkg_check_modules(PC_ICU_I18N icu-i18n)
-     find_library(
-         ICU_I18N_LIBRARY
--        NAMES icui18n libicui18n libicuin cygicuin cygicuin32 icuin
--        HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
--              ${PC_ICU_I18N_LIBDIR}
--              ${WEBKIT_LIBRARIES_LINK_DIR}
-+        NAMES icui18n_jsc
-+        HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
-         DOC "Libraries to link against for ICU internationalization")
-     mark_as_advanced(ICU_I18N_LIBRARY)
-     if (ICU_I18N_LIBRARY)
-@@ -68,10 +62,8 @@
-     # Look for the ICU data libraries
-     find_library(
-         ICU_DATA_LIBRARY
--        NAMES icudata libicudata cygicudata cygicudata32
--        HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
--              ${PC_ICU_I18N_LIBDIR}
--              ${WEBKIT_LIBRARIES_LINK_DIR}
-+        NAMES icudata_jsc
-+        HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
-         DOC "Libraries to link against for ICU data")
-     mark_as_advanced(ICU_DATA_LIBRARY)
-     if (ICU_DATA_LIBRARY)
 diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/Source/JavaScriptCore/CMakeLists.txt
---- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt	2018-07-25 09:56:23.662494914 +0200
-+++ target/webkit/Source/JavaScriptCore/CMakeLists.txt	2018-07-18 12:55:24.726736260 +0200
-@@ -120,6 +120,8 @@
- set(JavaScriptCore_LIBRARIES
-     WTF${DEBUG_SUFFIX}
-     ${ICU_I18N_LIBRARIES}
-+    ${ICU_LIBRARIES}
-+    ${ICU_DATA_LIBRARIES}
+--- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt	2019-08-21 08:24:27.000000000 +0800
++++ target/webkit/Source/JavaScriptCore/CMakeLists.txt	2019-09-17 13:54:19.000000000 +0800
+@@ -118,6 +118,8 @@
+     WebKit::WTF
  )
 
++list(APPEND JavaScriptCore_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIES})
++
  if (USE_CAPSTONE)
+     list(APPEND JavaScriptCore_LIBRARIES capstone)
+ endif ()

patches/jsc_icu_integrate.patch

@@ -11,15 +11,16 @@ diff -aur target-org/webkit/Source/JavaScriptCore/API/JSBase.cpp target/webkit/S
 +void printVersion() {
 +    __android_log_print(3, "JavaScriptCore.Version", "%s", JSC_VERSION);
 +}
---- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt      2019-03-26 13:04:34.000000000 +0800
-+++ target/webkit/Source/JavaScriptCore/CMakeLists.txt  2019-03-26 13:01:41.000000000 +0800
-@@ -122,7 +122,9 @@
-     ${ICU_I18N_LIBRARIES}
-     ${ICU_LIBRARIES}
-     ${ICU_DATA_LIBRARIES}
-+    log
- )
-+add_definitions(-DJSC_VERSION="${JSC_VERSION}")
+diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/Source/JavaScriptCore/CMakeLists.txt
+--- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt	2019-09-17 13:57:03.000000000 +0800
++++ target/webkit/Source/JavaScriptCore/CMakeLists.txt	2019-09-17 13:57:08.000000000 +0800
+@@ -120,6 +120,9 @@
+
+ list(APPEND JavaScriptCore_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIES})
 
++list(APPEND JavaScriptCore_LIBRARIES log)
++add_definitions(-DJSC_VERSION="${JSC_VERSION}")
++
  if (USE_CAPSTONE)
      list(APPEND JavaScriptCore_LIBRARIES capstone)
+ endif ()

patches/jsc_startup_log_version.patch

@@ -19,15 +19,13 @@ compile() {
   do
     export ANDROID_API=$ANDROID_API_FOR_ABI_32
     export JSC_ARCH=$arch
-    export ENABLE_COMPAT=1
     compile_arch
   done
 
   for arch in arm64 x86_64
   do
     export ANDROID_API=$ANDROID_API_FOR_ABI_64
     export JSC_ARCH=$arch
-    export ENABLE_COMPAT=0
     compile_arch
   done
 }

scripts/compile/all.sh

@@ -17,6 +17,7 @@ cd $BUILD_DIR
 
 CROSS_BUILD_DIR=$(realpath $TARGETDIR/icu/host)
 PATH=$TOOLCHAIN_DIR/bin:$PATH
+INSTALL_DIR=${BUILD_DIR}/prebuilts
 
 if [[ "$BUILD_TYPE" = "Release" ]]
 then
@@ -26,7 +27,7 @@ else
 fi
 
 ICU_DATA_FILTER_FILE="${TARGETDIR}/icu/filters/android.json" \
-$TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
+$TARGETDIR/icu/source/configure --prefix=${INSTALL_DIR} \
     $BUILD_TYPE_CONFIG \
     --host=$CROSS_COMPILE_PLATFORM \
     --enable-static=yes \
@@ -49,9 +50,8 @@ $TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
     RINLIB=$CROSS_COMPILE_PLATFORM-ranlib \
     --with-data-packaging=static
 
-make -j5
+make -j5 install
 
 if ! [[ $ENABLE_INTL ]]; then
-  rm lib/libicui18n_jsc.a
-  cp stubdata/libicudata_jsc.a lib/
+  cp stubdata/libicudata.a ${INSTALL_DIR}/lib/
 fi

scripts/compile/icu.sh

@@ -14,7 +14,6 @@ CMAKE_CXX_FLAGS=" \
 $SWITCH_JSC_CFLAGS_COMPAT \
 $JSC_CFLAGS \
 $PLATFORM_CFLAGS \
--I$TARGETDIR/icu/source/i18n \
 "
 
 CMAKE_LD_FLAGS=" \
@@ -25,14 +24,7 @@ $JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
 
-export AR=$CROSS_COMPILE_PLATFORM-ar
-export AS=$CROSS_COMPILE_PLATFORM-as
-export CC=$CROSS_COMPILE_PLATFORM_CC-clang
-export CXX=$CROSS_COMPILE_PLATFORM_CC-clang++
-export LD=$CROSS_COMPILE_PLATFORM-ld
-export STRIP=$CROSS_COMPILE_PLATFORM-strip
-
-ARCH_NAME_PLATFORM_arm="arm"
+ARCH_NAME_PLATFORM_arm="armv7-a"
 ARCH_NAME_PLATFORM_arm64="aarch64"
 ARCH_NAME_PLATFORM_x86="i686"
 ARCH_NAME_PLATFORM_x86_64="x86_64"
@@ -71,18 +63,12 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --no-xslt \
   --no-netscape-plugin-api \
   --no-tools \
-  --cmakeargs="-DCMAKE_SYSTEM_NAME=Android \
-  $SWITCH_BUILD_WEBKIT_CMAKE_ARGS_COMPAT \
-  -DCMAKE_SYSTEM_VERSION=$ANDROID_API \
-  -DCMAKE_SYSTEM_PROCESSOR=$ARCH_NAME \
-  -DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TOOLCHAIN_DIR \
-  -DWEBKIT_LIBRARIES_INCLUDE_DIR=$TARGETDIR/icu/source/common \
-  -DWEBKIT_LIBRARIES_LINK_DIR=$TARGETDIR/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/lib \
-  -DCMAKE_C_COMPILER=$CROSS_COMPILE_PLATFORM_CC-clang \
-  -DCMAKE_CXX_COMPILER=$CROSS_COMPILE_PLATFORM_CC-clang++ \
-  -DCMAKE_AR=$TOOLCHAIN_DIR/bin/$CROSS_COMPILE_PLATFORM-ar \
-  -DCMAKE_SYSROOT=$TOOLCHAIN_DIR/sysroot \
-  -DCMAKE_SYSROOT_COMPILE=$TOOLCHAIN_DIR/sysroot \
+  --cmakeargs="-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+  -DANDROID_ABI=${JNI_ARCH} \
+  -DANDROID_NATIVE_API_LEVEL=${ANDROID_API} \
+  -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH \
+  -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH \
+  -DICU_ROOT=${TARGETDIR}/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/prebuilts \
   -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} $COMMON_CXXFLAGS $CMAKE_CXX_FLAGS' \
   -DCMAKE_C_FLAGS='${CMAKE_C_FLAGS} $CMAKE_CXX_FLAGS' \
   -DCMAKE_C_FLAGS_DEBUG='${DEBUG_SYMBOL_LEVEL}' \
@@ -104,7 +90,7 @@ mkdir -p $INSTALL_UNSTRIPPED_DIR_I18N/$JNI_ARCH
 mkdir -p $INSTALL_DIR_I18N/$JNI_ARCH
 cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_UNSTRIPPED_DIR_I18N/$JNI_ARCH
 cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_DIR_I18N/$JNI_ARCH
-$TOOLCHAIN_BIN_STRIP $INSTALL_DIR_I18N/$JNI_ARCH/libjsc.so
+$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/bin/strip $INSTALL_DIR_I18N/$JNI_ARCH/libjsc.so
 mv $TARGETDIR/webkit/WebKitBuild $TARGETDIR/webkit/${CROSS_COMPILE_PLATFORM}-${FLAVOR}
 
 cp $TOOLCHAIN_DIR/sysroot/usr/lib/$CROSS_COMPILE_PLATFORM/libc++_shared.so $INSTALL_CPPRUNTIME_DIR

scripts/compile/jsc.sh

@@ -5,8 +5,7 @@ PATCHES_DIR=$ROOTDIR/patches
 # Patchset management that manage files by commented purpose
 ######################################################################################
 ICU_PATCHSET=(
-  # Basic build setup for JSC on Android
-  "icu.patch"
+  # Add ICU patchset if needed
 )
 
 JSC_PATCHSET=(

scripts/patch.sh

@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit