commit aa771a8babd95a271508f7f3ad3b521340a7995e
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Jun 23 23:40:34 2015 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sat Jul 04 16:22:03 2015 -0400
tree 405e58709000080349eb5c63215913e7ef051d65
parent 9754ae6de6464f83a2a9e89b434feec30c3d514a

build: fix few build paths

Refs #76072

Change-Id: I0d9e7ee1d0e375f275cbf14c31522dc496e7b20f

compile.sh

diff --git a/compile.sh b/compile.sh
index ead06d7..b568955 100755
--- a/compile.sh
+++ b/compile.sh
@@ -67,7 +67,7 @@
             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 @@
     # 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 @@
 
 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=