nointl build was broken due to incorrect codepoint comparison that was lost when rebasing the existing patch stack on the new JSC. efault collator lazy-property is now wrapped in #if ENABLE(INTL) so the no-intl flavor never tries to instantiate ICU

    machinery it does not ship. BabylonNative needs Inspector APIs to be available, and SharedArrayBuffer is now enabled for efficient communication via N-API native modules. add a small smoketest binary for NDK 28 and NDK 29 validation in Android simulator outside of the React Native-mandated NDK 27. we now have a way to validate runtime effectiveness of all NDK variant compiles within CI.

Author: matthargett

.github/workflows/build_and_test.yml

@@ -27,6 +27,7 @@ jobs:
       ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}
       NDK_VERSION_27: '27.1.12297006'
       NDK_VERSION_28: '28.2.13676358'
+      NDK_VERSION_29: '29.0.14206865'
       BUILD_CACHE_VERSION: v1
 
     steps:
@@ -85,9 +86,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.cache/ccache
-        key: ccache-${{ env.BUILD_CACHE_VERSION }}-${{ runner.os }}-${{ env.NDK_VERSION_27 }}-${{ steps.build-hash.outputs.hash }}
+        key: ccache-${{ env.BUILD_CACHE_VERSION }}-${{ runner.os }}-${{ env.NDK_VERSION_27 }}-${{ env.NDK_VERSION_28 }}-${{ env.NDK_VERSION_29 }}-${{ steps.build-hash.outputs.hash }}
         restore-keys: |
-          ccache-${{ env.BUILD_CACHE_VERSION }}-${{ runner.os }}-${{ env.NDK_VERSION_27 }}-
+          ccache-${{ env.BUILD_CACHE_VERSION }}-${{ runner.os }}-${{ env.NDK_VERSION_27 }}-${{ env.NDK_VERSION_28 }}-${{ env.NDK_VERSION_29 }}-
 
     - name: Configure ccache
       run: |
@@ -105,18 +106,37 @@ jobs:
         path: ${{ env.ANDROID_HOME }}/ndk/${{ env.NDK_VERSION_27 }}
         key: android-ndk-${{ runner.os }}-${{ env.NDK_VERSION_27 }}
 
+    - name: Cache Android NDK r28
+      id: cache-ndk-28
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.ANDROID_HOME }}/ndk/${{ env.NDK_VERSION_28 }}
+        key: android-ndk-${{ runner.os }}-${{ env.NDK_VERSION_28 }}
+
+    - name: Cache Android NDK r29
+      id: cache-ndk-29
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.ANDROID_HOME }}/ndk/${{ env.NDK_VERSION_29 }}
+        key: android-ndk-${{ runner.os }}-${{ env.NDK_VERSION_29 }}
+
     - name: Install Android packages
       run: |
         export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
         yes | sdkmanager --licenses || true
         sdkmanager "cmake;3.22.1"
-        if [[ ! -d "${ANDROID_HOME}/ndk/${NDK_VERSION_27}" ]]; then
-          sdkmanager "ndk;${NDK_VERSION_27}"
-        fi
-        UNICODE_DIR="${ANDROID_HOME}/ndk/${NDK_VERSION_27}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/unicode"
-        if [[ -d "${UNICODE_DIR}" ]]; then
-          mv "${UNICODE_DIR}" "${UNICODE_DIR}2"
-        fi
+        for version in "${NDK_VERSION_27}" "${NDK_VERSION_28}" "${NDK_VERSION_29}"; do
+          if [[ -z "$version" ]]; then
+            continue
+          fi
+          if [[ ! -d "${ANDROID_HOME}/ndk/${version}" ]]; then
+            sdkmanager "ndk;${version}"
+          fi
+          UNICODE_DIR="${ANDROID_HOME}/ndk/${version}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/unicode"
+          if [[ -d "${UNICODE_DIR}" ]]; then
+            mv "${UNICODE_DIR}" "${UNICODE_DIR}2"
+          fi
+        done
         echo "ANDROID_NDK=$ANDROID_HOME/ndk/${NDK_VERSION_27}" >> $GITHUB_ENV
         echo "PATH=$PATH" >> $GITHUB_ENV
       shell: bash
@@ -138,7 +158,32 @@ jobs:
 
     - name: Build
       if: steps.cache-dist.outputs.cache-hit != 'true'
-      run: yarn start
+      run: |
+        variants=(ndk27 ndk28c ndk29)
+        for variant in "${variants[@]}"; do
+          case "$variant" in
+            ndk27)
+              export ANDROID_NDK="$ANDROID_HOME/ndk/${NDK_VERSION_27}"
+              ;;
+            ndk28c)
+              export ANDROID_NDK="$ANDROID_HOME/ndk/${NDK_VERSION_28}"
+              ;;
+            ndk29)
+              export ANDROID_NDK="$ANDROID_HOME/ndk/${NDK_VERSION_29}"
+              ;;
+            *)
+              echo "Unknown variant $variant" >&2
+              exit 1
+          esac
+
+          if [[ ! -d "$ANDROID_NDK" ]]; then
+            echo "Android NDK not found at $ANDROID_NDK for variant $variant" >&2
+            exit 1
+          fi
+
+          export JSC_NDK_VARIANT="$variant"
+          yarn start
+        done
       shell: bash
 
     - name: Show ccache stats
@@ -241,6 +286,16 @@ jobs:
           set +e
           maestro test maestro.yaml
           STATUS=$?
+          if [ $STATUS -eq 0 ]; then
+            for variant in ndk27 ndk28c ndk29; do
+              ../scripts/run-js-smoketest.sh "$variant"
+              EXIT_CODE=$?
+              if [ $EXIT_CODE -ne 0 ]; then
+                STATUS=$EXIT_CODE
+                break
+              fi
+            done
+          fi
           adb logcat -d > adb.log
           exit $STATUS
 

patches/jsc_android_assertions_android_log.patch

@@ -0,0 +1,15 @@
+diff --git a/webkit/Source/WTF/wtf/Assertions.h b/webkit/Source/WTF/wtf/Assertions.h
+index 0000000..0000000 100644
+--- a/webkit/Source/WTF/wtf/Assertions.h
++++ b/webkit/Source/WTF/wtf/Assertions.h
+@@ -49,7 +49,7 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <wtf/ExportMacros.h>
+ 
+-#if OS(ANDROID) && !USE(BUN_JSC_ADDITIONS)
++#if OS(ANDROID)
+ #include <android/log.h>
+ #endif
+ 
+ #if OS(DARWIN)

patches/jsc_android_enable_sab.patch

@@ -0,0 +1,11 @@
+--- a/webkit/Source/JavaScriptCore/runtime/OptionsList.h	2025-11-06 00:08:49
++++ b/OptionsList.h.new	2025-11-06 16:08:43
+@@ -650,7 +650,7 @@
+     v(Bool, useMapGetOrInsert, true, Normal, "Expose the Map.prototype.getOrInsert family of methods."_s) \
+     v(Bool, useMathSumPreciseMethod, true, Normal, "Expose the Math.sumPrecise() method."_s) \
+     v(Bool, useMoreCurrencyDisplayChoices, false, Normal, "Enable more currencyDisplay choices for Intl.NumberFormat"_s) \
+-    v(Bool, useSharedArrayBuffer, false, Normal, nullptr) \
++    v(Bool, useSharedArrayBuffer, true, Normal, nullptr) \
+     v(Bool, useShadowRealm, false, Normal, "Expose the ShadowRealm object."_s) \
+     v(Bool, useTemporal, false, Normal, "Expose the Temporal object."_s) \
+     v(Bool, useTrustedTypes, true, Normal, "Enable trusted types eval protection feature."_s) \

patches/jsc_android_locale_fallback.patch

@@ -0,0 +1,72 @@
+--- a/webkit/Source/JavaScriptCore/runtime/StringPrototype.cpp	2025-11-06 15:50:41
++++ b/StringPrototype.cpp.new	2025-11-06 15:55:15
+@@ -35,6 +35,7 @@
+ #include "JSCInlines.h"
+ #include "JSStringIterator.h"
+ #include "ObjectConstructor.h"
++#include <compare>
+ #include "ParseInt.h"
+ #include "RegExpConstructor.h"
+ #include "RegExpGlobalDataInlines.h"
+@@ -1062,6 +1063,22 @@
+ 
+     auto that = thatCell->view(globalObject);
+     RETURN_IF_EXCEPTION(scope, { });
++
++#if !ENABLE(INTL)
++    auto fallback = [&] () -> EncodedJSValue {
++        auto ordering = WTF::codePointCompare(string, that);
++        int result = 0;
++        if (std::is_lt(ordering))
++            result = -1;
++        else if (std::is_gt(ordering))
++            result = 1;
++        return JSValue::encode(jsNumber(result));
++    };
++    RELEASE_AND_RETURN(scope, fallback());
++#else
++    auto throwUnavailable = [&] () -> EncodedJSValue {
++        return throwVMTypeError(globalObject, scope, "Intl.Collator is unavailable in this runtime"_s);
++    };
+ 
+     JSValue locales = callFrame->argument(1);
+     JSValue options = callFrame->argument(2);
+@@ -1072,8 +1089,11 @@
+         collator = IntlCollator::create(vm, globalObject->collatorStructure());
+         collator->initializeCollator(globalObject, locales, options);
+     }
+-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
++    RETURN_IF_EXCEPTION(scope, throwUnavailable());
++    if (!collator)
++        return throwUnavailable();
+     RELEASE_AND_RETURN(scope, JSValue::encode(jsNumber(collator->compareStrings(globalObject, string, that))));
++#endif
+ }
+ 
+ enum class CaseConversionMode {
+--- a/webkit/Source/JavaScriptCore/runtime/JSGlobalObject.cpp	2025-11-06 15:50:48
++++ b/JSGlobalObject.cpp.new	2025-11-06 15:55:47
+@@ -1460,6 +1460,7 @@
+             init.setConstructor(IntlNumberFormatConstructor::create(init.vm, IntlNumberFormatConstructor::createStructure(init.vm, init.global, init.global->functionPrototype()), jsCast<IntlNumberFormatPrototype*>(init.prototype)));
+         });
+ 
++#if ENABLE(INTL)
+     m_defaultCollator.initLater(
+         [] (const Initializer<IntlCollator>& init) {
+             JSGlobalObject* globalObject = jsCast<JSGlobalObject*>(init.owner);
+@@ -1467,9 +1468,14 @@
+             auto scope = DECLARE_THROW_SCOPE(vm);
+             IntlCollator* collator = IntlCollator::create(vm, globalObject->collatorStructure());
+             collator->initializeCollator(globalObject, jsUndefined(), jsUndefined());
+-            RETURN_IF_EXCEPTION(scope, void());
++            if (scope.exception()) {
++                init.property.setMayBeNull(vm, globalObject, nullptr);
++                return;
++            }
++            ASSERT(collator);
+             init.set(collator);
+         });
++#endif
+ 
+     m_defaultNumberFormat.initLater(
+         [] (const Initializer<IntlNumberFormat>& init) {

patches/jsc_android_release_flags.patch

@@ -1,14 +1,10 @@
 diff --git a/webkit/Source/cmake/OptionsCommon.cmake b/webkit/Source/cmake/OptionsCommon.cmake
-index ea7d508967d6..b4de9ef50bbf 100644
 --- a/webkit/Source/cmake/OptionsCommon.cmake
 +++ b/webkit/Source/cmake/OptionsCommon.cmake
-@@ -1,7 +1,11 @@
--set(CMAKE_CXX_STANDARD 23)
-+set(CMAKE_CXX_STANDARD 20)
+@@ -2,6 +2,9 @@
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  set(CMAKE_CXX_EXTENSIONS OFF)
  set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP OFF)
-+
 +# Android builds rely on downstream flags, so keep CMake from adding -O3 automatically.
 +set(CMAKE_C_COMPILE_OPTIONS_RELEASE -DNDEBUG CACHE STRING "" FORCE)
 +set(CMAKE_CXX_COMPILE_OPTIONS_RELEASE -DNDEBUG CACHE STRING "" FORCE)

patches/jsc_disable_api_tests.patch

@@ -1,8 +1,24 @@
-diff --git a/webkit/Source/cmake/OptionsJSCOnly.cmake b/webkit/Source/cmake/OptionsJSCOnly.cmake
-index f00830dd41..f9e131cfa3 100644
---- a/webkit/Source/cmake/OptionsJSCOnly.cmake
-+++ b/webkit/Source/cmake/OptionsJSCOnly.cmake
-@@ -101,10 +101,8 @@ else ()
+--- a/webkit/Source/cmake/OptionsJSCOnly.cmake	2025-11-06 00:08:55
++++ b/OptionsJSCOnly.cpp.new	2025-11-06 16:04:34
+@@ -50,7 +50,7 @@
+ WEBKIT_OPTION_BEGIN()
+ WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Whether to build JavaScriptCore as a static library." PUBLIC OFF)
+ WEBKIT_OPTION_DEFINE(USE_LIBBACKTRACE "Whether to enable usage of libbacktrace." PUBLIC OFF)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE OFF)
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ON)
+ if (WIN32)
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE OFF)
+ endif ()
+@@ -91,7 +91,7 @@
+ SET_AND_EXPOSE_TO_BUILD(ENABLE_RESOURCE_USAGE ON)
+ 
+ WEBKIT_OPTION_BEGIN()
+-WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Whether to build JavaScriptCore with remote inspector support" PUBLIC OFF)
++WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Whether to build JavaScriptCore with remote inspector support" PUBLIC ON)
+ if (ENABLE_REMOTE_INSPECTOR)
+     SET_AND_EXPOSE_TO_BUILD(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS 1)
+     SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER 1)
+@@ -101,10 +101,8 @@
  endif ()
  WEBKIT_OPTION_END()
 

scripts/build-hash.js

@@ -11,6 +11,7 @@ const includePaths = [
   'yarn.lock',
   'patches',
   'scripts',
+  'tools',
   'lib',
 ];