AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: look for Android SDK and NDK in standard locations

Browse Source 
These locations are where the official Android Studio IDE places its
copies of the SDK and NDK.

Change-Id: I2ea765c66a6ca4d11c573054375b797bd3da9d82
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Jake Petroules 2016-09-13 11:11:23 -07:00
parent 6ac4410228
commit 207694fbcb
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -515,6 +515,24 @@ QT_EXT_PREFIX=
# default qpa platform # default qpa platform
# Android vars # Android vars
if [ -z "$ANDROID_SDK_ROOT" ]; then
if [ "$UNAME_SYSTEM" = "Darwin" ] && [ -d "$HOME/Library/Android/sdk" ]; then
ANDROID_SDK_ROOT="$HOME/Library/Android/sdk"
elif [ "$UNAME_SYSTEM" = "Linux" ] && [ -d "$HOME/Android/Sdk" ]; then
ANDROID_SDK_ROOT="$HOME/Android/Sdk"
fi
fi
if [ -z "$ANDROID_NDK_ROOT" ]; then
if [ -d "$ANDROID_SDK_ROOT/ndk-bundle" ]; then
ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle"
elif [ "$UNAME_SYSTEM" = "Darwin" ] && [ -d "$HOME/Library/Android/sdk/ndk-bundle" ]; then
ANDROID_NDK_ROOT="$HOME/Library/Android/sdk/ndk-bundle"
elif [ "$UNAME_SYSTEM" = "Linux" ] && [ -d "$HOME/Android/Sdk/ndk-bundle" ]; then
ANDROID_NDK_ROOT="$HOME/Android/Sdk/ndk-bundle"
fi
fi
CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT
CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
CFG_DEFAULT_ANDROID_PLATFORM=android-16 CFG_DEFAULT_ANDROID_PLATFORM=android-16