From aa771a8babd95a271508f7f3ad3b521340a7995e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 23 Jun 2015 23:40:34 -0400
Subject: [PATCH] build: fix few build paths
Refs #76072
Change-Id: I0d9e7ee1d0e375f275cbf14c31522dc496e7b20f
---
compile.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/compile.sh b/compile.sh
index ead06d7b2..b56895572 100755
--- a/compile.sh
+++ b/compile.sh
@@ -67,7 +67,7 @@ if [ `set -- ${ANDROID_ABI}; echo $#` -gt 1 ]; then
NO_FPU=$NO_FPU NO_ARMV6=$NO_ARMV6 ANDROID_ABI=$i \
./compile.sh $* --jni || { echo "$i build KO"; exit 1; }
mkdir -p obj/
- cp -r ring-android/libs/$i obj
+ cp -r ring-android/app/src/main/libs/$i obj
echo "$i build OK"
done
for i in ${ANDROID_ABI_LIST}; do
@@ -244,7 +244,7 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then
# instruction and emulate it, so we select -mhard-float.
# See http://www.linux-mips.org/wiki/Floating_point#The_Linux_kernel_and_floating_point
else
- echo "Unknown ABI. Die, die, die!"
+ echo "Unknown ABI ${ANDROID_ABI}. Die, die, die!"
exit 2
fi
@@ -358,7 +358,7 @@ DRING_PATH="`pwd`"
if [ "$JNI" = 1 ]; then
CLEAN="jniclean"
- TARGET="ring-android/app/src/obj/local/${ANDROID_ABI}/libring.so"
+ TARGET="ring-android/app/src/main/obj/local/${ANDROID_ABI}/libring.so"
else
CLEAN="distclean"
TARGET=
--
GitLab