build: enable universal apk creation
This patch allows the compile.sh to create an universal apk from several
architectures.
It also bumps the daemon to a newer version.
Change-Id: I5bf744cad949441abccf27036b3b2c32941f8f59
Tuleap: #508
diff --git a/compile.sh b/compile.sh
index 09a4ce6..a22456b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -59,6 +59,7 @@
fi
if [ `set -- ${ANDROID_ABI}; echo $#` -gt 1 ]; then
+ ANDROID_ABIS=""
ANDROID_ABI_LIST="${ANDROID_ABI}"
echo "More than one ABI specified: ${ANDROID_ABI_LIST}"
for i in ${ANDROID_ABI_LIST}; do
@@ -71,11 +72,20 @@
echo "$i build OK"
done
for i in ${ANDROID_ABI_LIST}; do
- cp -r obj/$i ring-android/libs/
+ if [ -z "$ANDROID_ABIS" ]; then
+ ANDROID_ABIS="$ANDROID_ABIS'$i'"
+ else
+ ANDROID_ABIS="$ANDROID_ABIS,'$i'"
+ fi
+ cp -r obj/$i ring-android/app/src/main/libs/$i
rm -rf obj/$i
done
+ export ANDROID_ABIS
make -b -j1 RELEASE=$RELEASE apk || exit 1
exit 0
+elif [ -z "$ANDROID_ABI_LIST" ]; then
+ ANDROID_ABIS="${ANDROID_ABI}"
+ export ANDROID_ABIS
fi
HAVE_ARM=0
@@ -155,7 +165,7 @@
if [ "$FETCH" = 1 ]
then
# 1/ dring
- TESTED_HASH=3677f3ad0503f5dfaaf99ee4436fa6c0d680b9bd
+ TESTED_HASH=3facadc79402727c215f51ec52ebf3a0f79b4ba3
if [ ! -d "ring-daemon" ]; then
echo "ring daemon source not found, cloning"
git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git
@@ -258,7 +268,7 @@
mkdir -p contrib/${TARGET_TUPLE}/lib/pkgconfig
pushd contrib/native-${TARGET_TUPLE}
-../bootstrap --host=${TARGET_TUPLE}
+../bootstrap --host=${TARGET_TUPLE} --disable-libav --enable-ffmpeg
# Some libraries have arm assembly which won't build in thumb mode
# We append -marm to the CFLAGS of these libs to disable thumb mode
@@ -282,6 +292,7 @@
export RING_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
export RING_EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS}"
export RING_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"
+export SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
make list
make fetch