Fixed android libfreerdp install paths.

diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
index 73ce021..ea51993 100755 (executable)
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@@ -127,15 +127,20 @@ do
     fi
 
     # Build and install the library.
+    if [ $DEPS_ONLY -eq 0 ];
+    then
        common_run cd $BASE
        common_run mkdir -p $BUILD_SRC/freerdp-build/$ARCH
        common_run cd $BUILD_SRC/freerdp-build/$ARCH
        common_run export ANDROID_NDK=$ANDROID_NDK
        common_run cmake $CMAKE_CMD_ARGS \
                -DANDROID_ABI=$ARCH \
+               -DCMAKE_INSTALL_PREFIX=$BUILD_DST \
+               -DCMAKE_INSTALL_LIBDIR=$ARCH \
                $SRC_DIR
        echo $(pwd)
        common_run cmake --build . --target install
+    fi
 done
 
 echo "Successfully build library for architectures $BUILD_ARCH"

diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 2ef65da..18d6d6d 100644 (file)
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -16,6 +16,7 @@ WITH_JPEG=0
 WITH_OPENH264=0
 WITH_OPENSSL=1
 BUILD_DEPS=1
+DEPS_ONLY=0
 ANDROID_NATIVE_API_LEVEL=android-21
 
 JPEG_TAG=master