qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved Android SDK detection

Browse Source 
If ANDROID_HOME environment variable is set, add parameter
"/p:AndroidSdkDirectory=$ANDROID_HOME" to improve the Android SDK detection.
This commit is contained in:
Marco Dalla Libera
2019-08-12 16:37:11 +02:00
parent 6d82642176
commit ea5ae50813
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/build-scripts/build-apk.sh
View File

@@ -3,6 +3,12 @@ set -e
pushd ../keepass2android 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 popd

8
src/build-scripts/build-xamarin.sh
View File

@@ -20,6 +20,12 @@ popd
# call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64 # 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 popd