pick ndkr23 changes from #169

Author: Kudo

.github/workflows/build_and_test.yml

@@ -1,34 +1,42 @@
 name: Build jsc-android and test
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main]
+  pull_request:
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: reactnativecommunity/react-native-android:2019-9-4
+    container: reactnativecommunity/react-native-android:5.4
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Install packages
       run: |
         apt-get update
-        apt-get install coreutils realpath curl git subversion python3.5 python3.5-dev ruby gperf -y
-        update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 1
-        wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash
+        apt-get install coreutils curl git subversion wget python3 ruby gperf -y
+        wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
         echo 'export NVM_DIR="$HOME/.nvm"' >> "${HOME}/.bashrc"
         echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> "${HOME}/.bashrc"
         source "${HOME}/.bashrc"
-        nvm install 10
-        nvm use 10
-        nvm alias default 10
+        nvm install 16
+        nvm use 16
+        nvm alias default 16
       shell: bash
 
     - name: Install Android packages
       run: |
         sdkmanager \
-          "cmake;3.10.2.4988404"
+          "cmake;3.10.2.4988404" \
+          "cmake;3.18.1" \
+          "ndk;23.2.8568313"
+        # move out builtin icu headers from ndk and prevent icu build errors
+        mv "${ANDROID_HOME}/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/unicode" "${ANDROID_HOME}/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/unicode2"
+        echo "ANDROID_NDK=$ANDROID_HOME/ndk/23.2.8568313" >> $GITHUB_ENV
       shell: bash
+
     - name: Build
       run: |
         yarn clean
@@ -64,7 +72,7 @@ jobs:
     - name: Run test
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 16
-        arch: x86
+        api-level: 21
+        arch: x86_64
         disable-animations: false
         script: mv archive/dist . && cd test && yarn && cd android && ./gradlew assembleRelease assembleAndroidTest connectedAndroidTest

.gitignore

@@ -1,6 +1,7 @@
 package-lock.json
 /build
 /dist
+/dist.unstripped
 
 # Created by https://www.gitignore.io/api/node,android,reactnative,intellij+all,androidstudio,visualstudiocode
 

scripts/compile/common.sh

@@ -49,38 +49,18 @@ TOOLCHAIN_PLATFORM=$(ls -1 $ANDROID_NDK/toolchains/llvm/prebuilt | head -1)
 TOOLCHAIN_DIR="$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN_PLATFORM/"
 
 # settings
-PLATFORM_CFLAGS_arm=" \
--march=armv7-a \
--mfloat-abi=softfp \
--mfpu=neon \
--mthumb \
-"
-PLATFORM_LDFLAGS_arm=" \
--march=armv7-a \
--Wl,--fix-cortex-a8 \
-"
+PLATFORM_CFLAGS_arm=""
+PLATFORM_LDFLAGS_arm=""
 JNI_ARCH_arm=armeabi-v7a
 
 PLATFORM_LDFLAGS_arm64=""
 JNI_ARCH_arm64=arm64-v8a
 
-PLATFORM_CFLAGS_x86=" \
--march=i686 \
--mtune=intel \
--mssse3 \
--mfpmath=sse \
--m32 \
-"
+PLATFORM_CFLAGS_x86=""
 PLATFORM_LDFLAGS_x86=""
 JNI_ARCH_x86=x86
 
-PLATFORM_CFLAGS_x86_64=" \
--march=x86-64 \
--msse4.2 \
--mpopcnt \
--m64 \
--mtune=intel \
-"
+PLATFORM_CFLAGS_x86_64=""
 PLATFORM_LDFLAGS_x86_64=""
 JNI_ARCH_x86_64=x86_64
 
@@ -119,7 +99,7 @@ DEBUG_SYMBOL_LEVEL="-g2"
 if [[ "$BUILD_TYPE" = "Release" ]]
 then
     FRAME_POINTER_FLAG="-fomit-frame-pointer"
-    CFLAGS_BUILD_TYPE="-DNDEBUG -g0"
+    CFLAGS_BUILD_TYPE="-DNDEBUG -g0 -Oz -flto=full"
     ICU_CFLAGS_BUILD_TYPE="-Oz"
 else
     FRAME_POINTER_FLAG="-fno-omit-frame-pointer"
@@ -149,7 +129,7 @@ $FRAME_POINTER_FLAG \
 -DCUSTOMIZE_REACT_NATIVE \
 $SWITCH_COMMON_CFLAGS_INTL \
 $CFLAGS_BUILD_TYPE \
--D__ANDROID_API__=${ANDROID_API} \
+-D__ANDROID_MIN_SDK_VERSION__=${ANDROID_API} \
 "
 
 COMMON_CXXFLAGS=" \
@@ -158,8 +138,6 @@ COMMON_CXXFLAGS=" \
 ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS $ICU_CFLAGS_BUILD_TYPE"
 ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS $ICU_CFLAGS_BUILD_TYPE"
 ICU_LDFLAGS="$COMMON_LDFLAGS \
--fuse-ld=gold \
--Wl,--icf=safe \
 $PLATFORM_LDFLAGS \
 "
 

scripts/compile/icu.sh

@@ -46,8 +46,10 @@ $TARGETDIR/icu/source/configure --prefix=${INSTALL_DIR} \
     LDFLAGS="$ICU_LDFLAGS" \
     CC=$CROSS_COMPILE_PLATFORM_CC-clang \
     CXX=$CROSS_COMPILE_PLATFORM_CC-clang++ \
-    AR=$CROSS_COMPILE_PLATFORM-ar \
-    RINLIB=$CROSS_COMPILE_PLATFORM-ranlib \
+    AR=$TOOLCHAIN_DIR/bin/llvm-ar \
+    LD=$TOOLCHAIN_DIR/bin/ld \
+    RANLIB=$TOOLCHAIN_DIR/bin/llvm-ranlib \
+    STRIP=$TOOLCHAIN_DIR/bin/llvm-strip \
     --with-data-packaging=static
 
 make -j5 install

scripts/compile/jsc.sh

@@ -19,7 +19,7 @@ $PLATFORM_CFLAGS \
 CMAKE_LD_FLAGS=" \
 -latomic \
 -lm \
--lc++_shared \
+-static-libstdc++ \
 $JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
@@ -90,7 +90,5 @@ 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_DIR/$CROSS_COMPILE_PLATFORM/bin/strip $INSTALL_DIR_I18N/$JNI_ARCH/libjsc.so
+$TOOLCHAIN_DIR/bin/llvm-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