android: bump dring API
Update SWIG interface and retated code to build with lasted daemon APIs
Refs #74605
Change-Id: Id6e0a2ddecbb7329eacce0788329985e1287cf1e
diff --git a/compile.sh b/compile.sh
index 4c28c23..cf9bcb7 100755
--- a/compile.sh
+++ b/compile.sh
@@ -168,17 +168,17 @@
if [ "$FETCH" = 1 ]
then
# 1/ dring
- TESTED_HASH=64ed36af424b0e2e18e419be904926b591c58d61
- if [ ! -d "ring" ]; then
+ TESTED_HASH=1853fb821308514102cf6a98aef47ae127a78c99
+ if [ ! -d "ring-daemon" ]; then
echo "ring daemon source not found, cloning"
- git clone https://gerrit-ring.savoirfairelinux.com/ring
- cd ring
+ git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git
+ pushd ring-daemon
echo android/ >> .git/info/exclude
echo contrib/android/ >> .git/info/exclude
git checkout $TESTED_HASH
else
echo "ring daemon source found"
- cd ring
+ pushd ring-daemon
git fetch
git checkout ${TESTED_HASH}
# if ! git cat-file -e ${TESTED_HASH}; then
@@ -201,7 +201,7 @@
# fi
fi
else
- cd ring
+ pushd ring
fi
if [ -z "$BUILD" ]
@@ -214,7 +214,8 @@
if [ ${ANDROID_ABI} = "armeabi-v7a-hard" ] ; then
EXTRA_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mcpu=cortex-a8 -D_NDK_MATH_NO_SOFTFP=1"
elif [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
- EXTRA_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mthumb -mcpu=cortex-a8"
+ EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb"
+ #EXTRA_CFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mthumb -mcpu=cortex-a8"
elif [ ${ANDROID_ABI} = "armeabi" ] ; then
if [ -n "${NO_ARMV6}" ]; then
EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float "
@@ -244,12 +245,14 @@
EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2 -DHAVE_PTHREADS"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
+EXTRA_CXXFLAGS="${EXTRA_CFLAGS}"
+EXTRA_CFLAGS="-std=gnu11 ${EXTRA_CFLAGS}"
# Setup LDFLAGS
if [ ${ANDROID_ABI} = "armeabi-v7a-hard" ] ; then
EXTRA_LDFLAGS="-march=armv7-a -mfpu=vfpv3-d16 -mcpu=cortex-a8 -lm_hard -D_NDK_MATH_NO_SOFTFP=1"
elif [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
- EXTRA_LDFLAGS=""
+ EXTRA_LDFLAGS="-march=armv7-a -mthumb"
fi
EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI} -lgnustl_static"
@@ -327,12 +330,16 @@
which autopoint >/dev/null || make $MAKEFLAGS .gettext
export PATH="$PATH:$PWD/../$TARGET_TUPLE/bin"
-export RING_BUILD_DIR=ring/build-android-${TARGET_TUPLE}
+export RING_BUILD_DIR=ring-daemon/build-android-${TARGET_TUPLE}
+popd
############
# Make Ring #
############
-popd && mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
+RING_INSTALL_DIR="`realpath install-android-${TARGET_TUPLE}`"
+mkdir -p RING_INSTALL_DIR
+mkdir -p build-android-${TARGET_TUPLE} && pushd build-android-${TARGET_TUPLE}
+DRING_PATH="`pwd`"
if [ "$JNI" = 1 ]; then
CLEAN="jniclean"
@@ -349,7 +356,7 @@
cd ../
cd ring-android
./make-swig.sh
- cd ../ring/build-android-${TARGET_TUPLE}
+ cd ../ring-daemon/build-android-${TARGET_TUPLE}
echo "Configuring"
${ANDROID_PATH}/configure.sh ${OPTS}
fi
@@ -381,15 +388,15 @@
fi
# END OF ANDROID NDK FIXUP
-echo "Building dring"
-make $MAKEFLAGS
+echo "Building dring ${MAKEFLAGS}"
+V=99 make $MAKEFLAGS
####################################
# Ring android UI and specific code
####################################
-echo "Building Ring for Android"
-cd ../../../
+cd ../..
+echo "Building Ring for Android ${PWD}"
make $CLEAN
make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH CXXSTL=$CXXSTL RELEASE=$RELEASE $TARGET
@@ -424,7 +431,7 @@
export ANDROID_NDK=$ANDROID_NDK
export GCCVER=$GCCVER
export CXXSTL=$CXXSTL
-export SFLPHONE_BUILD_DIR=$SFLPHONE_BUILD_DIR
+export RING_BUILD_DIR=$RING_BUILD_DIR
export TARGET_TUPLE=$TARGET_TUPLE
export PATH_HOST=$PATH_HOST
export PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH