commit 86759bbc5aa3e089c6b3d24d0a937ff2f43385ba
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Sep 28 13:54:54 2016 -0400
committer Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Wed Sep 28 19:09:41 2016 -0400
tree 5b3778335c5e9fd02f904d0cb68aa725070bc97a
parent 36beae3a44f5e190a94f19f598107f4f392d5119

jni: build using LLVM/clang

* update build system to use LLVM/Clang for contrib/daemon/JNI
  compilation
* unify build system between daemon and JNI modules
* requires Android NDK r12b+ (build machine)
* uses clang 3.8, links with static stdc++

Tuleap: #575
Change-Id: I7003ee4469418b334fd98eaeb259616c5f8192ee

configure.sh

diff --git a/configure.sh b/configure.sh
index 9dcc713..de7faaf 100755
--- a/configure.sh
+++ b/configure.sh
@@ -5,6 +5,11 @@
     exit 1
 fi
 
+if [ -z "$NDK_TOOLCHAIN_PATH" ]; then
+    echo "Please set the NDK_TOOLCHAIN_PATH environment variable with its path."
+    exit 1
+fi
+
 if [ -z "$ANDROID_ABI" ]; then
     echo "Please set ANDROID_ABI to your architecture: armeabi-v7a, armeabi, arm64-v8a, x86, x86_64 or mips."
     exit 1
@@ -29,17 +34,17 @@
     fi
 fi
 
-CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
-LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}"
+CPPFLAGS="-I${NDK_TOOLCHAIN_PATH}/include/c++/4.9.x -I${RING_SRC_DIR}/contrib/${TARGET_TUPLE}/include "
+LDFLAGS="$LDFLAGS -L${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}/lib/${ANDROID_ABI} -L${RING_SRC_DIR}/contrib/${TARGET_TUPLE}/lib "
 
-SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
+SYSROOT=$NDK_TOOLCHAIN_PATH/sysroot
 
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${RING_EXTRA_CFLAGS}" \
 CXXFLAGS="$CXXFLAGS ${RING_EXTRA_CXXFLAGS}" \
 LDFLAGS="$LDFLAGS ${RING_EXTRA_LDFLAGS}" \
-CC="${CROSS_COMPILE}gcc --sysroot=${SYSROOT}" \
-CXX="${CROSS_COMPILE}g++ --sysroot=${SYSROOT}" \
+CC="clang" \
+CXX="clang++" \
 NM="${CROSS_COMPILE}nm" \
 STRIP="${CROSS_COMPILE}strip" \
 RANLIB="${CROSS_COMPILE}ranlib" \
@@ -47,6 +52,6 @@
 AS="${CROSS_COMPILE}as" \
 PKG_CONFIG_LIBDIR=$RING_SRC_DIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
 $RING_SRC_DIR/configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
-                   --disable-shared --with-opensl --without-dbus --without-alsa --without-pulse \
+                   --disable-shared --with-opensl --without-dbus --without-alsa --without-pulse --without-speexdsp \
                    --prefix=$RING_SRC_DIR/install-android-$TARGET_TUPLE \
                    $*