Fix Android build paths
authorChristian Plattner <ccpp@gmx.at>
Sun, 15 Nov 2020 03:38:11 +0000 (04:38 +0100)
committerakallabeth <akallabeth@posteo.net>
Wed, 2 Dec 2020 08:06:10 +0000 (09:06 +0100)
(cherry picked from commit 00173a0ef3a9ad5eb0511f800d910f463bd8bac1)

scripts/android-build-freerdp.sh
scripts/android-build-openssl.sh

index ebb7612..40f26f2 100755 (executable)
@@ -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)
 
index 8fe220f..834e53a 100755 (executable)
@@ -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"