Fix Android build paths

(cherry picked from commit 00173a0ef3)
2020-11-15 04:38:11 +01:00 · 2020-11-15 04:38:11 +01:00 · fddde5bdc2
commit fddde5bdc2
parent 0b8cf6ce1d
2 changed files with 3 additions and 1 deletions
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@ -8,7 +8,8 @@ WITH_JPEG=0
 WITH_OPENH264=0
 WITH_OPENSSL=0

-SRC_DIR=$(pwd)
+SRC_DIR=$(dirname "${BASH_SOURCE[0]}")
+SRC_DIR=$(realpath "$SRC_DIR")
 BUILD_SRC=$(pwd)
 BUILD_DST=$(pwd)

--- a/scripts/android-build-openssl.sh
+++ b/scripts/android-build-openssl.sh
@ -19,6 +19,7 @@ function build {

    common_run export CC=clang
    common_run export PATH=$(${SCRIPT_PATH}/toolchains_path.py --ndk ${ANDROID_NDK}):$ORG_PATH
+    common_run export ANDROID_NDK

 	echo "CONFIG=$CONFIG"
 	echo "DST_PREFIX=$DST_PREFIX"