Copy c++ lib

Author: ukasiu

common.sh

@@ -18,24 +18,27 @@ CROSS_COMPILE_PLATFORM=${!var}
 TOOLCHAIN_DIR=$ROOTDIR/target/toolchains/$CROSS_COMPILE_PLATFORM
 
 # settings
+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_DIR/$CROSS_COMPILE_PLATFORM/lib/armv7-a \
+-L$TOOLCHAIN_LINK_DIR_arm \
 -march=armv7-a \
 -Wl,--fix-cortex-a8 \
 "
 JNI_ARCH_arm=armeabi-v7a
 
+TOOLCHAIN_LINK_DIR_arm64="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib"
 PLATFORM_LDFLAGS_arm64=" \
--L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
+-L$TOOLCHAIN_LINK_DIR_arm64 \
 "
 JNI_ARCH_arm64=arm64-v8a
 
+TOOLCHAIN_LINK_DIR_x86="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib"
 PLATFORM_CFLAGS_x86=" \
 -march=i686 \
 -mtune=intel \
@@ -44,10 +47,11 @@ PLATFORM_CFLAGS_x86=" \
 -m32 \
 "
 PLATFORM_LDFLAGS_x86=" \
--L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
+-L$TOOLCHAIN_LINK_DIR_x86 \
 "
 JNI_ARCH_x86=x86
 
+TOOLCHAIN_LINK_DIR_x86_64="$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib"
 PLATFORM_CFLAGS_x86_64=" \
 -march=x86-64 \
 -msse4.2 \
@@ -56,7 +60,7 @@ PLATFORM_CFLAGS_x86_64=" \
 -mtune=intel \
 "
 PLATFORM_LDFLAGS_x86_64=" \
--L$TOOLCHAIN_DIR/$CROSS_COMPILE_PLATFORM/lib \
+-L$TOOLCHAIN_LINK_DIR_x86_64 \
 "
 JNI_ARCH_x86_64=x86_64
 
@@ -67,6 +71,8 @@ var="PLATFORM_LDFLAGS_$JSC_ARCH"
 PLATFORM_LDFLAGS=${!var}
 var="JNI_ARCH_$JSC_ARCH"
 JNI_ARCH=${!var}
+var="TOOLCHAIN_LINK_DIR_$JSC_ARCH"
+TOOLCHAIN_LINK_DIR=${!var}
 
 # checks
 err=false

jsc.sh

@@ -48,5 +48,6 @@ $PLATFORM_LDFLAGS \
   -DCMAKE_VERBOSE_MAKEFILE=on \
   "
 
+cp $ROOTDIR/target/webkit/WebKitBuild/Release/lib/libjsc.so $INSTALL_DIR
 mv $ROOTDIR/target/webkit/WebKitBuild $ROOTDIR/target/webkit/$CROSS_COMPILE_PLATFORM
-cp $ROOTDIR/target/webkit/WebKitBuild/Release/lib/libjsc.so $INSTALL_DIR
+cp $TOOLCHAIN_LINK_DIR/libc++_shared.so $INSTALL_DIR