Upgrade to support NDK r19+ (and only support r19+)

Author: Kudo

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     working_directory: ~/jsc-android-buildscripts
     machine: true
     environment:
-      NDK_VERSION: r17c
+      NDK_VERSION: r19c
       SDK_VERSION: sdk-tools-linux-3859397.zip
       ANDROID_HOME: /home/circleci/android-sdk
       ANDROID_NDK: /home/circleci/android-ndk

scripts/compile/all.sh

@@ -3,10 +3,6 @@
 SCRIPT_DIR=$(cd `dirname $0`; pwd)
 
 compile_arch() {
-  echo -e '\033]2;'"compiling toolchain for $JSC_ARCH $FLAVOR"'\007'
-  printf "\n\n\n\t\t=================== compiling toolchain for $JSC_ARCH $FLAVOR ===================\n\n\n"
-  $SCRIPT_DIR/toolchain.sh
-
   echo -e '\033]2;'"compiling icu for $JSC_ARCH $FLAVOR"'\007'
   printf "\n\n\n\t\t=================== compiling icu for $JSC_ARCH $FLAVOR ===================\n\n\n"
   $SCRIPT_DIR/icu.sh

scripts/compile/common.sh

@@ -35,61 +35,53 @@ CROSS_COMPILE_PLATFORM_arm="arm-linux-androideabi"
 CROSS_COMPILE_PLATFORM_arm64="aarch64-linux-android"
 CROSS_COMPILE_PLATFORM_x86="i686-linux-android"
 CROSS_COMPILE_PLATFORM_x86_64="x86_64-linux-android"
+CROSS_COMPILE_PLATFORM_CC_arm="armv7a-linux-androideabi"
+CROSS_COMPILE_PLATFORM_CC_arm64="$CROSS_COMPILE_PLATFORM_arm64"
+CROSS_COMPILE_PLATFORM_CC_x86="$CROSS_COMPILE_PLATFORM_x86"
+CROSS_COMPILE_PLATFORM_CC_x86_64="$CROSS_COMPILE_PLATFORM_x86_64"
 
 # arch
 var="CROSS_COMPILE_PLATFORM_$JSC_ARCH"
 CROSS_COMPILE_PLATFORM=${!var}
-TOOLCHAIN_DIR=$TARGETDIR/toolchains/$CROSS_COMPILE_PLATFORM
+var="CROSS_COMPILE_PLATFORM_CC_$JSC_ARCH"
+CROSS_COMPILE_PLATFORM_CC=${!var}${ANDROID_API}
+TOOLCHAIN_PLATFORM=$(ls -1 $ANDROID_NDK/toolchains/llvm/prebuilt | head -1)
+TOOLCHAIN_DIR="$ANDROID_NDK/toolchains/llvm/prebuilt/$TOOLCHAIN_PLATFORM/"
 
 # settings
-TOOLCHAIN_BIN_STRIP_arm="$TOOLCHAIN_DIR/bin/arm-linux-androideabi-strip"
-TOOLCHAIN_LINK_DIR_arm="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib/armv7-a"
 PLATFORM_CFLAGS_arm=" \
 -march=armv7-a \
 -mfloat-abi=softfp \
 -mfpu=neon \
 -mthumb \
 "
 PLATFORM_LDFLAGS_arm=" \
--L$TOOLCHAIN_LINK_DIR_arm \
 -march=armv7-a \
 -Wl,--fix-cortex-a8 \
 "
 JNI_ARCH_arm=armeabi-v7a
 
-TOOLCHAIN_BIN_STRIP_arm64="$TOOLCHAIN_DIR/bin/aarch64-linux-android-strip"
-TOOLCHAIN_LINK_DIR_arm64="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib"
-PLATFORM_LDFLAGS_arm64=" \
--L$TOOLCHAIN_LINK_DIR_arm64 \
-"
+PLATFORM_LDFLAGS_arm64=""
 JNI_ARCH_arm64=arm64-v8a
 
-TOOLCHAIN_BIN_STRIP_x86="$TOOLCHAIN_DIR/bin/i686-linux-android-strip"
-TOOLCHAIN_LINK_DIR_x86="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib"
 PLATFORM_CFLAGS_x86=" \
 -march=i686 \
 -mtune=intel \
 -mssse3 \
 -mfpmath=sse \
 -m32 \
 "
-PLATFORM_LDFLAGS_x86=" \
--L$TOOLCHAIN_LINK_DIR_x86 \
-"
+PLATFORM_LDFLAGS_x86=""
 JNI_ARCH_x86=x86
 
-TOOLCHAIN_BIN_STRIP_x86_64="$TOOLCHAIN_DIR/bin/x86_64-linux-android-strip"
-TOOLCHAIN_LINK_DIR_x86_64="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib64"
 PLATFORM_CFLAGS_x86_64=" \
 -march=x86-64 \
 -msse4.2 \
 -mpopcnt \
 -m64 \
 -mtune=intel \
 "
-PLATFORM_LDFLAGS_x86_64=" \
--L$TOOLCHAIN_LINK_DIR_x86_64 \
-"
+PLATFORM_LDFLAGS_x86_64=""
 JNI_ARCH_x86_64=x86_64
 
 # arch
@@ -99,10 +91,6 @@ var="PLATFORM_LDFLAGS_$JSC_ARCH"
 PLATFORM_LDFLAGS=${!var}
 var="JNI_ARCH_$JSC_ARCH"
 JNI_ARCH=${!var}
-var="TOOLCHAIN_BIN_STRIP_$JSC_ARCH"
-TOOLCHAIN_BIN_STRIP=${!var}
-var="TOOLCHAIN_LINK_DIR_$JSC_ARCH"
-TOOLCHAIN_LINK_DIR=${!var}
 
 # options flags
 # INTL

scripts/compile/icu.sh

@@ -43,8 +43,8 @@ $TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
     CFLAGS="$ICU_CFLAGS" \
     CXXFLAGS="$ICU_CXXFLAGS" \
     LDFLAGS="$ICU_LDFLAGS" \
-    CC=$CROSS_COMPILE_PLATFORM-clang \
-    CXX=$CROSS_COMPILE_PLATFORM-clang++ \
+    CC=$CROSS_COMPILE_PLATFORM_CC-clang \
+    CXX=$CROSS_COMPILE_PLATFORM_CC-clang++ \
     AR=$CROSS_COMPILE_PLATFORM-ar \
     RINLIB=$CROSS_COMPILE_PLATFORM-ranlib \
     --with-data-packaging=static

scripts/compile/jsc.sh

@@ -15,7 +15,6 @@ $SWITCH_JSC_CFLAGS_COMPAT \
 $JSC_CFLAGS \
 $PLATFORM_CFLAGS \
 -I$TARGETDIR/icu/source/i18n \
--I$TOOLCHAIN_DIR/sysroot/usr/include \
 "
 
 CMAKE_LD_FLAGS=" \
@@ -27,9 +26,9 @@ $PLATFORM_LDFLAGS \
 "
 
 export AR=$CROSS_COMPILE_PLATFORM-ar
-export AS=$CROSS_COMPILE_PLATFORM-clang
-export CC=$CROSS_COMPILE_PLATFORM-clang
-export CXX=$CROSS_COMPILE_PLATFORM-clang++
+export AS=$CROSS_COMPILE_PLATFORM-as
+export CC=$CROSS_COMPILE_PLATFORM_CC-clang
+export CXX=$CROSS_COMPILE_PLATFORM_CC-clang++
 export LD=$CROSS_COMPILE_PLATFORM-ld
 export STRIP=$CROSS_COMPILE_PLATFORM-strip
 
@@ -79,8 +78,9 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   -DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TOOLCHAIN_DIR \
   -DWEBKIT_LIBRARIES_INCLUDE_DIR=$TARGETDIR/icu/source/common \
   -DWEBKIT_LIBRARIES_LINK_DIR=$TARGETDIR/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/lib \
-  -DCMAKE_C_COMPILER=$CROSS_COMPILE_PLATFORM-clang \
-  -DCMAKE_CXX_COMPILER=$CROSS_COMPILE_PLATFORM-clang \
+  -DCMAKE_C_COMPILER=$CROSS_COMPILE_PLATFORM_CC-clang \
+  -DCMAKE_CXX_COMPILER=$CROSS_COMPILE_PLATFORM_CC-clang++ \
+  -DCMAKE_AR=$TOOLCHAIN_DIR/bin/$CROSS_COMPILE_PLATFORM-ar \
   -DCMAKE_SYSROOT=$TOOLCHAIN_DIR/sysroot \
   -DCMAKE_SYSROOT_COMPILE=$TOOLCHAIN_DIR/sysroot \
   -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} $COMMON_CXXFLAGS $CMAKE_CXX_FLAGS' \
@@ -106,3 +106,5 @@ cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_UNSTRIPPED_D
 cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_DIR_I18N/$JNI_ARCH
 $TOOLCHAIN_BIN_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