patches on top of bun, scripts to make things more dynamically discoverable on any build machine

Author: matthargett

patches/jsc_android_logging_property.patch

@@ -0,0 +1,30 @@
+diff --git a/webkit/Source/WTF/wtf/android/LoggingAndroid.cpp b/webkit/Source/WTF/wtf/android/LoggingAndroid.cpp
+--- a/webkit/Source/WTF/wtf/android/LoggingAndroid.cpp
++++ b/webkit/Source/WTF/wtf/android/LoggingAndroid.cpp
+@@ -32,20 +32,15 @@
+ 
+ String logLevelString()
+ {
+-    const char* propertyValue = nullptr;
++    constexpr auto propertyName = "debug." LOG_CHANNEL_WEBKIT_SUBSYSTEM ".log";
++    char propertyValue[PROP_VALUE_MAX] { };
++    int length = __system_property_get(propertyName, propertyValue);
+ 
+-    if (const auto* propertyInfo = __system_property_find("debug." LOG_CHANNEL_WEBKIT_SUBSYSTEM ".log")) {
+-        __system_property_read_callback(propertyInfo, [](void *userData, const char*, const char* value, unsigned) {
+-            auto **propertyValue = static_cast<const char**>(userData);
+-            *propertyValue = value;
+-        }, &propertyValue);
+-    }
+-
+     // Disable all log channels if the property is unset or empty.
+-    if (!propertyValue || !*propertyValue)
+-        return makeString("-all"_s);
++    if (length <= 0)
++        return "-all"_s;
+ 
+-    return String::fromLatin1(propertyValue);
++    return String::fromLatin1(propertyValue);
+ }
+ 
+ } // namespace WTF

patches/jsc_android_release_flags.patch

@@ -0,0 +1,17 @@
+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)
+ 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)
+ 
+ add_definitions(-DBUILDING_WITH_CMAKE=1)
+ add_definitions(-DBUILDING_WEBKIT=1)

patches/jsc_android_systemheap_posix_memalign.patch

@@ -0,0 +1,18 @@
+diff --git a/webkit/Source/bmalloc/bmalloc/SystemHeap.cpp b/webkit/Source/bmalloc/bmalloc/SystemHeap.cpp
+--- a/webkit/Source/bmalloc/bmalloc/SystemHeap.cpp
++++ b/webkit/Source/bmalloc/bmalloc/SystemHeap.cpp
+@@ -210,7 +210,13 @@ void* SystemHeap::malloc(size_t size, FailureAction action)
+
+ void* SystemHeap::memalign(size_t alignment, size_t size, FailureAction action)
+ {
+-    void* result = ::aligned_alloc(alignment, size);
++    void* result = nullptr;
++#if PAS_OS(ANDROID)
++    if (::posix_memalign(&result, alignment, size))
++        result = nullptr;
++#else
++    result = ::aligned_alloc(alignment, size);
++#endif
+     RELEASE_BASSERT(action == FailureAction::ReturnNull || result);
+     return result;
+ }

patches/jsc_android_thread_name_guard.patch

@@ -0,0 +1,17 @@
+diff --git a/webkit/Source/bmalloc/libpas/src/libpas/pas_thread_local_cache.c b/webkit/Source/bmalloc/libpas/src/libpas/pas_thread_local_cache.c
+--- a/webkit/Source/bmalloc/libpas/src/libpas/pas_thread_local_cache.c
++++ b/webkit/Source/bmalloc/libpas/src/libpas/pas_thread_local_cache.c
+@@ -221,9 +221,13 @@ static void dump_thread_diagnostics(pthread_t thread)
+ #endif
+ #if PAS_PLATFORM(PLAYSTATION)
+     getname_result = pthread_get_name_np(thread, thread_name);
++#else
++#if PAS_OS(ANDROID)
++    getname_result = -1;
+ #else
+     getname_result = pthread_getname_np(thread, thread_name, sizeof(thread_name));
+ #endif
++#endif
+     if (!getname_result)
+         pas_log("[%d] thread %p has name %s\n", getpid(), (void*)thread, thread_name);
+     else

scripts/patch.sh

@@ -50,6 +50,18 @@ JSC_PATCHSET=(
 
   # Avoid ICU formatting dependencies when validating time zones
   "jsc_android_timezone_validate.patch"
+
+  # Force Android builds to use C++20 and drop toolchain -O3 defaults
+  "jsc_android_release_flags.patch"
+
+  # Avoid pthread_getname_np usage on Android where it's unavailable
+  "jsc_android_thread_name_guard.patch"
+
+  # Use posix_memalign when aligned_alloc is missing on older Android
+  "jsc_android_systemheap_posix_memalign.patch"
+
+  # Use legacy system property getter on older Android
+  "jsc_android_logging_property.patch"
 )
 
 ######################################################################################

scripts/start.sh

@@ -16,6 +16,21 @@ if [[ -z "$ANDROID_NDK" || ! -d "$ANDROID_NDK" ]]; then
   export ANDROID_NDK="$DEFAULT_ANDROID_NDK"
 fi
 
+if [[ -z "$JAVA_HOME" || ! -x "$JAVA_HOME/bin/java" ]]; then
+  if [[ "$(uname -s)" == "Darwin" ]]; then
+    if command -v brew >/dev/null 2>&1; then
+      HOMEBREW_JAVA_ROOT="$(brew --prefix openjdk@17 2>/dev/null)/libexec/openjdk.jdk/Contents/Home"
+      if [[ -x "$HOMEBREW_JAVA_ROOT/bin/java" ]]; then
+        export JAVA_HOME="$HOMEBREW_JAVA_ROOT"
+      fi
+    fi
+  fi
+fi
+
+if [[ -n "$JAVA_HOME" && -x "$JAVA_HOME/bin/java" ]]; then
+  export PATH="$JAVA_HOME/bin:$PATH"
+fi
+
 source $ROOTDIR/scripts/env.sh
 source $ROOTDIR/scripts/info.sh
 export JSC_VERSION=${npm_package_version}