2.22.2 update (#65)

Author: wkozyra95

README.md

@@ -48,7 +48,7 @@ Follow steps below in order for your React Native app to use new version of JSC
 1. Add `jsc-android` to the "dependencies" section in your `package.json`:
 ```diff
 dependencies {
-+  "jsc-android": "225067.x.x",
++  "jsc-android": "237548.x.x",
 ```
 
 then run `npm install` or `yarn` (depending which npm client you use) in order for the new dependency to be installed in `node_modules`
@@ -78,7 +78,7 @@ allprojects {
 
 +configurations.all {
 +    resolutionStrategy {
-+        force 'org.webkit:android-jsc:r225067'
++        force 'org.webkit:android-jsc:r237548'
 +    }
 +}
 
@@ -109,7 +109,7 @@ To use this variant instead replace the third installation step with:
 +    resolutionStrategy {
 +        eachDependency { DependencyResolveDetails details ->
 +            if (details.requested.name == 'android-jsc') {
-+                details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r225067'
++                details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r237548'
 +            }
 +        }
 +    }

measure/scripts/measure.js

@@ -135,6 +135,6 @@ function getDensity() {
 }
 
 function getScreenSize() {
-  const size = exec.execSyncRead(`adb shell wm size | grep -Eo "\\d+x\\d+"`, true);
+  const size = exec.execSyncRead(`adb shell wm size | grep -Eo "[0-9]+x[0-9]+"`, true);
   return size.split('x');
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsc-android",
-  "version": "225067.0.0",
+  "version": "237548.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.19.2",
+    "webkitGTK": "2.22.2",
     "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96"
   }
 }

patches/intl/icu-disabled.patch

@@ -1,12 +1,13 @@
 diff -aur target-icucollator/webkit/Source/WTF/wtf/CMakeLists.txt target/webkit/Source/WTF/wtf/CMakeLists.txt
 --- target-icucollator/webkit/Source/WTF/wtf/CMakeLists.txt	2017-07-11 13:16:20.800299018 +0200
 +++ target/webkit/Source/WTF/wtf/CMakeLists.txt	2017-07-11 13:17:20.743222116 +0200
-@@ -331,7 +331,7 @@
+@@ -331,9 +331,8 @@
  endif ()
 
  list(APPEND WTF_SOURCES
+     unicode/CollatorDefault.cpp
+
 -    unicode/icu/CollatorICU.cpp
-+    unicode/CollatorDefault.cpp
  )
  set(WTF_SYSTEM_INCLUDE_DIRECTORIES
      ${ICU_INCLUDE_DIRS}

patches/jsc.patch

@@ -86,7 +86,7 @@ diff -aur target-org/webkit/Source/cmake/OptionsJSCOnly.cmake target/webkit/Sour
 -endif ()
 +set(ENABLE_API_TESTS OFF)
 +set(ENABLE_SAMPLING_PROFILER OFF)
-+set(ENABLE_DFG_JIT OFF)
++set(ENABLE_DFG_JIT ON)
 +set(ENABLE_FTL_JIT OFF)
 +set(ENABLE_JIT ON)
 
@@ -113,9 +113,9 @@ diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/S
  # Force staging of shared scripts, even if they aren't directly used to build JavaScriptCore.
 
 diff -aur target-org/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp target/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp
---- target-org/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp	2017-09-08 02:11:21.000000000 +0300
-+++ target/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp	2018-06-14 15:41:18.000000000 +0300
-@@ -24,22 +24,25 @@
+--- target-org/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp  2016-10-08 05:31:15.000000000 +0200
++++ target/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp  2017-07-11 11:34:55.962374878 +0200
+@@ -24,22 +24,27 @@
  #include <locale.h>
  #include <wtf/Vector.h>
  #include <wtf/text/WTFString.h>
@@ -131,25 +131,26 @@ diff -aur target-org/webkit/Source/WTF/wtf/unix/LanguageUnix.cpp target/webkit/S
 -    String localeDefault(setlocale(LC_CTYPE, nullptr));
 -    if (localeDefault.isEmpty() || equalIgnoringASCIICase(localeDefault, "C") || equalIgnoringASCIICase(localeDefault, "POSIX"))
 +    char buf[2 * (PROP_VALUE_MAX + 1)];
++
 +    int locale_len = __system_property_get("persist.sys.locale", buf);
 +    if (locale_len == 0) {
 +      int lang_len = __system_property_get("persist.sys.language", buf);
 +      if(lang_len == 0) {
-         return ASCIILiteral("en-US");
--
--    String normalizedDefault = localeDefault;
--    normalizedDefault.replace('_', '-');
--    normalizedDefault.truncate(normalizedDefault.find('.'));
--    return normalizedDefault;
+         return "en-US"_s;
 +      }
 +      int country_len = __system_property_get("persist.sys.country", buf + lang_len + 1);
 +      if(country_len != 0) {
 +        buf[lang_len] = '-';
 +      }
 +    }
+
+-    String normalizedDefault = localeDefault;
+-    normalizedDefault.replace('_', '-');
+-    normalizedDefault.truncate(normalizedDefault.find('.'));
+-    return normalizedDefault;
 +    return String(buf);
  }
- 
+
  Vector<String> platformUserPreferredLanguages()
 diff -aur target-org/webkit/Source/WTF/wtf/StackTrace.cpp target/webkit/Source/WTF/wtf/StackTrace.cpp
 --- target-org/webkit/Source/WTF/wtf/StackTrace.cpp	2017-04-25 04:53:49.000000000 +0200
@@ -195,15 +196,15 @@ diff -aur target-org/webkit/Source/WTF/wtf/unicode/CollatorDefault.cpp target/we
 diff -aur org/target/webkit/Source/cmake/OptionsCommon.cmake target/webkit/Source/cmake/OptionsCommon.cmake
 --- target-org/webkit/Source/cmake/OptionsCommon.cmake      2017-11-15 16:28:52.120093206 +0100
 +++ target/webkit/Source/cmake/OptionsCommon.cmake  2017-04-09 02:50:32.875166000 +0200
-@@ -255,7 +255,7 @@
+@@ -115,7 +115,7 @@
 
  # Check for headers
- _HAVE_CHECK_INCLUDE(HAVE_ERRNO_H errno.h)
--_HAVE_CHECK_INCLUDE(HAVE_LANGINFO_H langinfo.h)
-+#_HAVE_CHECK_INCLUDE(HAVE_LANGINFO_H langinfo.h)
- _HAVE_CHECK_INCLUDE(HAVE_MMAP sys/mman.h)
- _HAVE_CHECK_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h)
- _HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_ERRNO_H errno.h)
+-WEBKIT_CHECK_HAVE_INCLUDE(HAVE_LANGINFO_H langinfo.h)
++#WEBKIT_CHECK_HAVE_INCLUDE(HAVE_LANGINFO_H langinfo.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_MMAP sys/mman.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h)
+ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_STRINGS_H strings.h)
 diff -aur target-org/webkit/Source/cmake/FindICU.cmake target/webkit/Source/cmake/FindICU.cmake
 --- target-org/webkit/Source/cmake/FindICU.cmake	2018-07-24 15:41:23.452474811 +0200
 +++ target/webkit/Source/cmake/FindICU.cmake	2018-07-12 15:53:44.611542333 +0200
@@ -259,13 +260,12 @@ diff -aur target-org/webkit/Source/cmake/FindICU.cmake target/webkit/Source/cmak
 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
-@@ -1072,6 +1072,8 @@
+@@ -118,5 +118,7 @@
  set(JavaScriptCore_LIBRARIES
      WTF${DEBUG_SUFFIX}
      ${ICU_I18N_LIBRARIES}
 +    ${ICU_LIBRARIES}
 +    ${ICU_DATA_LIBRARIES}
-     ${LLVM_LIBRARIES}
  )
 
 diff -aur target-org/webkit/Source/JavaScriptCore/API/JSBase.cpp target/webkit/Source/JavaScriptCore/API/JSBase.cpp
@@ -284,12 +284,10 @@ diff -aur target-org/webkit/Source/JavaScriptCore/API/JSBase.cpp target/webkit/S
 diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/Source/JavaScriptCore/CMakeLists.txt
 --- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt	2017-10-16 15:19:26.000000000 +0300
 +++ target/webkit/Source/JavaScriptCore/CMakeLists.txt	2018-10-09 14:44:23.000000000 +0300
-@@ -1073,6 +1073,8 @@
+@@ -119,4 +119,6 @@
      WTF${DEBUG_SUFFIX}
      ${ICU_I18N_LIBRARIES}
-     ${LLVM_LIBRARIES}
 +    log
  )
 +add_definitions(-DJSC_VERSION="${JSC_VERSION}")
 
- set(JavaScriptCore_SCRIPTS_SOURCES_DIR "${JAVASCRIPTCORE_DIR}/Scripts")