Publish stripped libraries in default AAR.

Summary:
    1. To reduce final APK size, publish stripped libjsc.so in dist/**/*.aar

    2. The unstripped version is important for troubleshooting
       especially crash backtrace symbalication.
       Will publish unstripped version in dist.unstripped/**/*.aar

Author: Kudo

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
       - run: npm run start
       - run:
           name: compress dist
-          command: tar -czf dist.tgz dist
+          command: tar -czf dist.tgz dist dist.unstripped
       - store_artifacts:
           path: dist.tgz
       - run:

lib/android-jsc/build.gradle

@@ -1,5 +1,15 @@
 apply plugin: 'com.android.library'
 
+def distDir = project.findProperty("distDir") ?: ""
+def jniLibsDir = project.findProperty("jniLibsDir") ?: ""
+def revision = project.findProperty("revision") ?: "".replaceAll("\\s", "")
+def i18n = project.findProperty("i18n") ?: ""
+
+if (!distDir) throw new RuntimeException("expecting --project-prop distDir=??? but was empty")
+if (!jniLibsDir) throw new RuntimeException("expecting --project-prop jniLibsDir=??? but was empty")
+if (!revision) throw new RuntimeException("expecting --project-prop revision=??? but was empty")
+if (!i18n) throw new RuntimeException("expecting --project-prop i18n=??? but was empty")
+
 android {
     compileSdkVersion 28
 
@@ -12,7 +22,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ["${rootDir}/../build/compiled"]
+            jniLibs.srcDirs = ["${jniLibsDir}"]
         }
     }
 
@@ -26,16 +36,6 @@ dependencies {}
 apply plugin: 'maven'
 
 task createAAR(type: Upload) {
-    def distDir = "${rootDir}/../dist"
-
-    def revision = project.findProperty("revision") ?: "".replaceAll("\\s", "")
-    def i18n = project.findProperty("i18n") ?: ""
-
-    doFirst {
-        if (!revision) throw new RuntimeException("expecting --project-prop revision=??? but was empty")
-        if (!i18n) throw new RuntimeException("expecting --project-prop i18n=??? but was empty")
-    }
-
     project.group = "org.webkit"
     def artifactName = Boolean.valueOf(i18n) ? "android-jsc-intl" : "android-jsc"
     project.version = "r${revision}"

lib/cppruntime/build.gradle

@@ -1,5 +1,13 @@
 apply plugin: 'com.android.library'
 
+def distDir = project.findProperty("distDir") ?: ""
+def jniLibsDir = project.findProperty("jniLibsDir") ?: ""
+def revision = project.findProperty("revision") ?: "".replaceAll("\\s", "")
+
+if (!distDir) throw new RuntimeException("expecting --project-prop distDir=??? but was empty")
+if (!jniLibsDir) throw new RuntimeException("expecting --project-prop jniLibsDir=??? but was empty")
+if (!revision) throw new RuntimeException("expecting --project-prop revision=??? but was empty")
+
 android {
     compileSdkVersion 28
 
@@ -12,7 +20,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ["${rootDir}/../build/cppruntime"]
+            jniLibs.srcDirs = ["${jniLibsDir}"]
         }
     }
 }
@@ -22,14 +30,6 @@ dependencies {}
 apply plugin: 'maven'
 
 task createAAR(type: Upload) {
-    def distDir = "${rootDir}/../dist"
-
-    def revision = project.findProperty("revision") ?: "".replaceAll("\\s", "")
-
-    doFirst {
-        if (!revision) throw new RuntimeException("expecting --project-prop revision=??? but was empty")
-    }
-
     project.group = "org.webkit"
     project.version = "r${revision}"
 

scripts/compile/all.sh

@@ -6,11 +6,11 @@ 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
-  
+
   echo -e '\033]2;'"compiling jsc for $JSC_ARCH $FLAVOR"'\007'
   printf "\n\n\n\t\t=================== compiling jsc for $JSC_ARCH $FLAVOR ===================\n\n\n"
   $SCRIPT_DIR/jsc.sh

scripts/compile/common.sh

@@ -42,6 +42,7 @@ CROSS_COMPILE_PLATFORM=${!var}
 TOOLCHAIN_DIR=$TARGETDIR/toolchains/$CROSS_COMPILE_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 \
@@ -56,12 +57,14 @@ PLATFORM_LDFLAGS_arm=" \
 "
 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 \
 "
 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 \
@@ -75,6 +78,7 @@ 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 \
@@ -95,6 +99,8 @@ 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}
 
@@ -170,9 +176,3 @@ $PLATFORM_LDFLAGS \
 
 JSC_LDFLAGS="$COMMON_LDFLAGS"
 JSC_CFLAGS="$COMMON_CFLAGS -DU_STATIC_IMPLEMENTATION=1 -DU_SHOW_CPLUSPLUS_API=0"
-
-INSTALL_DIR=$ROOTDIR/build/compiled/$JNI_ARCH
-mkdir -p $INSTALL_DIR
-
-INSTALL_CPPRUNTIME_DIR=$ROOTDIR/build/cppruntime/$JNI_ARCH
-mkdir -p $INSTALL_CPPRUNTIME_DIR

scripts/compile/jsc.sh

@@ -100,5 +100,9 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   $BUILD_TYPE_FLAGS \
   "
 
-cp $TARGETDIR/webkit/WebKitBuild/$BUILD_TYPE/lib/libjsc.so $INSTALL_DIR
+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_BIN_STRIP $INSTALL_DIR_I18N/$JNI_ARCH/libjsc.so
 mv $TARGETDIR/webkit/WebKitBuild $TARGETDIR/webkit/${CROSS_COMPILE_PLATFORM}-${FLAVOR}

scripts/compile/toolchain.sh

@@ -11,4 +11,5 @@ $ANDROID_NDK/build/tools/make_standalone_toolchain.py \
     --arch $ARCH \
     --stl libc++
 
-cp $TOOLCHAIN_LINK_DIR/libc++_shared.so $INSTALL_CPPRUNTIME_DIR
+mkdir -p $INSTALL_CPPRUNTIME_DIR/$JNI_ARCH
+cp $TOOLCHAIN_LINK_DIR/libc++_shared.so $INSTALL_CPPRUNTIME_DIR/$JNI_ARCH

scripts/env.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+export ROOTDIR=$PWD
+
+# Intermediated build target dir
+export TARGETDIR=$ROOTDIR/build/target
+
+# JSC shared library install dir
+export INSTALL_DIR=$ROOTDIR/build/compiled
+
+# JSC unstripped shared library install dir
+export INSTALL_UNSTRIPPED_DIR=$ROOTDIR/build/compiled.unstripped
+
+# CPP runtime shared library install dir
+export INSTALL_CPPRUNTIME_DIR=$ROOTDIR/build/cppruntime
+
+# Install dir for i18n build variants
+export INSTALL_DIR_I18N_true=$INSTALL_DIR/intl
+export INSTALL_DIR_I18N_false=$INSTALL_DIR/nointl
+export INSTALL_UNSTRIPPED_DIR_I18N_true=$INSTALL_UNSTRIPPED_DIR/intl
+export INSTALL_UNSTRIPPED_DIR_I18N_false=$INSTALL_UNSTRIPPED_DIR/nointl

scripts/info.sh

@@ -8,8 +8,8 @@ export REVISION=$(svn info "${URL}" | sed -n 's/^Last Changed Rev: //p')
 CONFIG=$(node -e "console.log(require('$ROOTDIR/package.json').config)")
 APPLE_VERSION=$(svn cat "${URL}/Source/WebCore/Configurations/Version.xcconfig" | grep 'MAJOR_VERSION\s=\|MINOR_VERSION\s=\|TINY_VERSION\s=\|MICRO_VERSION\s=\|NANO_VERSION\s=')
 
-if [ -d "$ROOTDIR/build/compiled" ]; then
-  SIZE=$(du -ah $ROOTDIR/build/compiled)
+if [ -d "$INSTALL_DIR_I18N_false" ]; then
+  SIZE=$(du -ah $INSTALL_DIR_I18N_false)
 else
   SIZE="0"
 fi

scripts/start.sh

@@ -3,7 +3,8 @@
 export ANDROID_API_FOR_ABI_32=16
 export ANDROID_API_FOR_ABI_64=21
 export ROOTDIR=$PWD
-export TARGETDIR=$ROOTDIR/build/target
+
+source $ROOTDIR/scripts/env.sh
 source $ROOTDIR/scripts/info.sh
 export JSC_VERSION=${npm_package_version}
 export BUILD_TYPE=Release
@@ -64,38 +65,58 @@ prep() {
 
 compile() {
   printf "\n\n\t\t===================== starting to compile all archs for i18n="${I18N}" =====================\n\n"
-  rm -rf $ROOTDIR/build/compiled
+  local var="INSTALL_DIR_I18N_${I18N}"
+  export INSTALL_DIR_I18N=${!var}
+  local var="INSTALL_UNSTRIPPED_DIR_I18N_${I18N}"
+  export INSTALL_UNSTRIPPED_DIR_I18N=${!var}
+  rm -rf $INSTALL_DIR_I18N
+  rm -rf $INSTALL_UNSTRIPPED_DIR_I18N
   $ROOTDIR/scripts/compile/all.sh
 }
 
 createAAR() {
-  TARGET=$1
-  printf "\n\n\t\t===================== create aar :$TARGET: =====================\n\n"
+  local target=$1
+  local distDir=$2
+  local jniLibsDir=$3
+  local i18n=$4
+  printf "\n\n\t\t===================== create aar :${target}: =====================\n\n"
   cd $ROOTDIR/lib
-  ./gradlew clean :$TARGET:createAAR --project-prop revision="$REVISION" --project-prop i18n="${I18N}"
+  ./gradlew clean :${target}:createAAR \
+      --project-prop distDir="${distDir}" \
+      --project-prop jniLibsDir="${jniLibsDir}" \
+      --project-prop revision="$REVISION" \
+      --project-prop i18n="${i18n}"
   cd $ROOTDIR
-  unset TARGET
 }
 
 copyHeaders() {
-  printf "\n\n\t\t===================== adding headers to $ROOTDIR/dist/include =====================\n\n"
-  mkdir -p $ROOTDIR/dist/include
-  cp -Rf $TARGETDIR/webkit/Source/JavaScriptCore/API/*.h $ROOTDIR/dist/include
+  local distDir=$1
+  printf "\n\n\t\t===================== adding headers to ${distDir}/include =====================\n\n"
+  mkdir -p ${distDir}/include
+  cp -Rf $TARGETDIR/webkit/Source/JavaScriptCore/API/*.h ${distDir}/include
 }
 
 export I18N=false
 prep
 compile
-createAAR "android-jsc"
 
 export I18N=true
 prep
 compile
-createAAR "android-jsc"
-
-createAAR "cppruntime"
 
-copyHeaders
+export DISTDIR=${ROOTDIR}/dist
+printf "\n\n\t\t===================== create stripped distributions =====================\n\n"
+createAAR "android-jsc" ${DISTDIR} ${INSTALL_DIR_I18N_false} "false"
+createAAR "android-jsc" ${DISTDIR} ${INSTALL_DIR_I18N_true} "true"
+createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
+copyHeaders ${DISTDIR}
+
+printf "\n\n\t\t===================== create unstripped distributions =====================\n\n"
+export DISTDIR=${ROOTDIR}/dist.unstripped
+createAAR "android-jsc" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_false} "false"
+createAAR "android-jsc" ${DISTDIR} ${INSTALL_UNSTRIPPED_DIR_I18N_true} "true"
+createAAR "cppruntime" ${DISTDIR} ${INSTALL_CPPRUNTIME_DIR} "false"
+copyHeaders ${DISTDIR}
 
 npm run info