From ea5ae5081316bf196031c94957ecda411e6c21f2 Mon Sep 17 00:00:00 2001
From: Marco Dalla Libera <info@marcodallalibera.it>
Date: Mon, 12 Aug 2019 16:37:11 +0200
Subject: [PATCH] Improved Android SDK detection

If ANDROID_HOME environment variable is set, add parameter
"/p:AndroidSdkDirectory=$ANDROID_HOME" to improve the Android SDK detection.
---
 src/build-scripts/build-apk.sh     | 8 +++++++-
 src/build-scripts/build-xamarin.sh | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/build-scripts/build-apk.sh b/src/build-scripts/build-apk.sh
index 2f29a0bc..2b580f88 100755
--- a/src/build-scripts/build-apk.sh
+++ b/src/build-scripts/build-apk.sh
@@ -3,6 +3,12 @@ set -e
 
 pushd ../keepass2android
 
-xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild keepass2android.csproj /t:SignAndroidPackage "$@"
+else
+	xabuild keepass2android.csproj /p:AndroidSdkDirectory=$ANDROID_HOME /t:SignAndroidPackage "$@"
+fi
 
 popd
diff --git a/src/build-scripts/build-xamarin.sh b/src/build-scripts/build-xamarin.sh
index a9ca3c16..075973f3 100755
--- a/src/build-scripts/build-xamarin.sh
+++ b/src/build-scripts/build-xamarin.sh
@@ -20,6 +20,12 @@ popd
 
 # call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 
-xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+# check if ANDROID_HOME is defined
+if [ -z ${ANDROID_HOME+x} ];
+then
+	xabuild KeePass.sln /target:keepass2android /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+else
+	xabuild KeePass.sln /target:keepass2android /p:AndroidSdkDirectory=$ANDROID_HOME /p:BuildProjectReferences=true /p:Configuration="Debug" /p:Platform="Any CPU" "$@"
+fi
 
 popd