Merge pull request FreeRDP#3438 from akallabeth/android_build_paths

Fixed android libfreerdp install paths.
treetory · Jul 8, 2016 · 5d7027a · 5d7027a
2 parents c4e3db0 + 40bfc17
commit 5d7027a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/client/Android/Studio/gradle.properties b/client/Android/Studio/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx4096M
diff --git 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
@@ -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