clang bug in NDK 27 makes loop vectorization pass error. disable the warning (to about warnings as errors killing the build unnecessarily), but also disable loop vectorization options until NDK can be bumped. downgrade to c++20 to align with React Native constraints.

Author: matthargett

lib/jsc-android/build.gradle

@@ -28,6 +28,10 @@ android {
     versionCode 1
     versionName "1.0"
 
+    ndk {
+      abiFilters 'arm64-v8a', 'x86_64'
+    }
+
     externalNativeBuild {
       cmake {
         arguments '-DANDROID_STL=c++_shared',

scripts/compile/all.sh

@@ -15,12 +15,14 @@ compile_arch() {
 }
 
 compile() {
-  for arch in arm x86
-  do
-    export ANDROID_API=$ANDROID_API_FOR_ABI_32
-    export JSC_ARCH=$arch
-    compile_arch
-  done
+  if [[ "${INCLUDE_32_BIT_ABIS:-0}" == "1" ]]; then
+    for arch in arm x86
+    do
+      export ANDROID_API=$ANDROID_API_FOR_ABI_32
+      export JSC_ARCH=$arch
+      compile_arch
+    done
+  fi
 
   for arch in arm64 x86_64
   do

scripts/compile/common.sh

@@ -86,7 +86,7 @@ process_switch_options "INTL"
 
 # checks
 err=false
-if ! [[ $ANDROID_API_FOR_ABI_32 ]]; then echo "set ANDROID_API_FOR_ABI_32 to the minimum supported Android platform version for arm and x86 (e.g. 16)"; err=true; fi
+if [[ "${INCLUDE_32_BIT_ABIS:-0}" == "1" ]] && ! [[ $ANDROID_API_FOR_ABI_32 ]]; then echo "set ANDROID_API_FOR_ABI_32 to the minimum supported Android platform version for arm and x86 (e.g. 16)"; err=true; fi
 if ! [[ $ANDROID_API_FOR_ABI_64 ]]; then echo "set ANDROID_API_FOR_ABI_64 to the minimum supported Android platform version for arm64 and x86_64 (e.g. 21)"; err=true; fi
 if ! [[ $FLAVOR ]]; then echo "set FLAVOR to the name of the flavor"; err=true; fi
 if ! [[ $CROSS_COMPILE_PLATFORM ]]; then echo "set JSC_ARCH to one of {arm,arm64,x86,x86_64}"; err=true; fi
@@ -101,8 +101,8 @@ DEBUG_SYMBOL_LEVEL="-g2"
 if [[ "$BUILD_TYPE" = "Release" ]]
 then
     FRAME_POINTER_FLAG="-fomit-frame-pointer"
-    CFLAGS_BUILD_TYPE="-DNDEBUG -g0 -O2 -flto=thin -fvectorize -fslp-vectorize -funroll-loops"
-    ICU_CFLAGS_BUILD_TYPE="-O2 -flto=thin -fvectorize -fslp-vectorize -funroll-loops"
+    CFLAGS_BUILD_TYPE="-DNDEBUG -g0 -O2 -flto=thin"
+    ICU_CFLAGS_BUILD_TYPE="-O2 -flto=thin"
 else
     FRAME_POINTER_FLAG="-fno-omit-frame-pointer"
     CFLAGS_BUILD_TYPE=""
@@ -132,15 +132,16 @@ $FRAME_POINTER_FLAG \
 -DCUSTOMIZE_REACT_NATIVE \
 $SWITCH_COMMON_CFLAGS_INTL \
 $CFLAGS_BUILD_TYPE \
+-Wno-pass-failed=loop-vectorize \
 -D__ANDROID_MIN_SDK_VERSION__=${ANDROID_API} \
 "
 
 COMMON_CXXFLAGS=" \
--std=c++2b \
+-std=c++20 \
 "
 
 ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS $ICU_CFLAGS_BUILD_TYPE"
-ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS $ICU_CFLAGS_BUILD_TYPE"
+ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS"
 ICU_LDFLAGS="$COMMON_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "

scripts/compile/jsc.sh

@@ -10,27 +10,20 @@ rm -rf $TARGETDIR/webkit/$CROSS_COMPILE_PLATFORM-${FLAVOR}
 rm -rf $TARGETDIR/webkit/WebKitBuild
 cd $TARGETDIR/webkit/Tools/Scripts
 
-CMAKE_CXX_FLAGS=" \
-$SWITCH_JSC_CFLAGS_COMPAT \
-$JSC_CFLAGS \
-$PLATFORM_CFLAGS \
-"
-
-CMAKE_LD_FLAGS=" \
--latomic \
--lm \
--lc++_shared \
-$JSC_LDFLAGS \
-$PLATFORM_LDFLAGS \
-"
-
 ARCH_NAME_PLATFORM_arm="armv7-a"
 ARCH_NAME_PLATFORM_arm64="aarch64"
 ARCH_NAME_PLATFORM_x86="i686"
 ARCH_NAME_PLATFORM_x86_64="x86_64"
 var="ARCH_NAME_PLATFORM_$JSC_ARCH"
 export ARCH_NAME=${!var}
 
+BASE_C_FLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS"
+BASE_CXX_FLAGS="$COMMON_CXXFLAGS $BASE_C_FLAGS"
+BASE_LD_FLAGS="-latomic -lm -lc++_shared $JSC_LDFLAGS $PLATFORM_LDFLAGS"
+
+export CFLAGS="$BASE_C_FLAGS"
+export CXXFLAGS="$BASE_CXX_FLAGS"
+export LDFLAGS="$BASE_LD_FLAGS"
 
 if [[ "$BUILD_TYPE" = "Release" ]]
 then
@@ -50,6 +43,7 @@ JSC_FEATURE_FLAGS=" \
 $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --jsc-only \
   $BUILD_TYPE_CONFIG \
+  --no-fatal-warnings \
   "$SWITCH_BUILD_WEBKIT_OPTIONS_INTL" \
   --no-xslt \
   --no-netscape-plugin-api \
@@ -66,12 +60,20 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   -DICU_ROOT=${TARGETDIR}/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/prebuilts \
   -DICU_INCLUDE_DIR=${TARGETDIR}/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/prebuilts/include \
   -DENABLE_API_TESTS=OFF \
-  -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}' \
-  -DCMAKE_CXX_FLAGS_DEBUG='${DEBUG_SYMBOL_LEVEL}' \
-  -DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS} $CMAKE_LD_FLAGS' \
-  -DCMAKE_EXE_LINKER_FLAGS='${CMAKE_MODULE_LINKER_FLAGS} $CMAKE_LD_FLAGS' \
+  -DCMAKE_C_FLAGS=\"$BASE_C_FLAGS\" \
+  -DCMAKE_CXX_FLAGS=\"$BASE_CXX_FLAGS\" \
+  -DCMAKE_C_FLAGS_RELEASE=\"$BASE_C_FLAGS\" \
+  -DCMAKE_CXX_FLAGS_RELEASE=\"$BASE_CXX_FLAGS\" \
+  -DCMAKE_C_FLAGS_RELWITHDEBINFO=\"$BASE_C_FLAGS\" \
+  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=\"$BASE_CXX_FLAGS\" \
+  -DCMAKE_C_FLAGS_DEBUG=\"$BASE_C_FLAGS $DEBUG_SYMBOL_LEVEL\" \
+  -DCMAKE_CXX_FLAGS_DEBUG=\"$BASE_CXX_FLAGS $DEBUG_SYMBOL_LEVEL\" \
+  -DCMAKE_SHARED_LINKER_FLAGS=\"$BASE_LD_FLAGS\" \
+  -DCMAKE_MODULE_LINKER_FLAGS=\"$BASE_LD_FLAGS\" \
+  -DCMAKE_EXE_LINKER_FLAGS=\"$BASE_LD_FLAGS\" \
+  -DCMAKE_CXX_STANDARD=20 \
+  -DCMAKE_CXX_STANDARD_REQUIRED=ON \
+  -DCMAKE_CXX_EXTENSIONS=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=on \
   -DENABLE_API_TESTS=OFF \
   -DENABLE_SAMPLING_PROFILER=OFF \

scripts/start.sh

@@ -35,13 +35,13 @@ patchAndMakeICU() {
 
   if [[ "$BUILD_TYPE" = "Release" ]]
   then
-    local OPT_FLAGS="-O2 -flto=thin -fvectorize -fslp-vectorize -funroll-loops"
+    local OPT_FLAGS="-O2 -flto=thin -Wno-pass-failed=loop-vectorize"
     CFLAGS="$OPT_FLAGS"
-    CXXFLAGS="-std=c++2b $OPT_FLAGS"
+    CXXFLAGS="-std=c++20 $OPT_FLAGS"
     LDFLAGS="-flto=thin"
   else
     CFLAGS="-g2"
-    CXXFLAGS="-std=c++2b"
+    CXXFLAGS="-std=c++20"
     LDFLAGS=""
   fi