From b439c415689de122b9fdba76847618799392bd90 Mon Sep 17 00:00:00 2001
From: Armin Novak <anovak@thinstuff.at>
Date: Thu, 21 Nov 2013 12:27:26 +0100
Subject: [PATCH] Copying libraries now to subfoler lib, because CMake searches
 for them there.

---
 scripts/android_setup_build_env.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/android_setup_build_env.sh b/scripts/android_setup_build_env.sh
index dfeb13843..f60fca422 100755
--- a/scripts/android_setup_build_env.sh
+++ b/scripts/android_setup_build_env.sh
@@ -65,9 +65,8 @@ if [ -z "$SSL_ROOT" ]; then
 	echo "OpenSSL was not build successfully, aborting."
 	exit -42
 fi
-mkdir -p $SSL_ROOT/obj/local/armeabi/
-cp $SSL_ROOT/libssl.a $SSL_ROOT/obj/local/armeabi/
-cp $SSL_ROOT/libcrypto.a $SSL_ROOT/obj/local/armeabi/
+mkdir -p $SSL_ROOT/lib
+cp $SSL_ROOT/*.a $SSL_ROOT/lib/
 
 rm -f $ROOT/openssl
 ln -s $SSL_ROOT $ROOT/openssl
@@ -117,6 +116,8 @@ if [ $RETVAL -ne 0 ]; then
 	echo "Failed to execute ndk-build command [$RETVAL]"
 	exit -7
 fi
+mkdir -p $JPEG_LIBRARY_SRC/lib
+cp $JPEG_LIBRARY_SRC/obj/local/armeabi-v7a/*.a $JPEG_LIBRARY_SRC/lib/
 
 echo "Prepared external libraries, you can now build the application."
 exit 0