From 207694fbcb7a68f7145b86e787d8e51cc3bb5aa2 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 13 Sep 2016 11:11:23 -0700 Subject: [PATCH] configure: look for Android SDK and NDK in standard locations These locations are where the official Android Studio IDE places its copies of the SDK and NDK. Change-Id: I2ea765c66a6ca4d11c573054375b797bd3da9d82 Reviewed-by: BogDan Vatra --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure b/configure index 3bd49a76f08..bdf43304ba6 100755 --- a/configure +++ b/configure @@ -515,6 +515,24 @@ QT_EXT_PREFIX= # default qpa platform # 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_SDK_ROOT=$ANDROID_SDK_ROOT CFG_DEFAULT_ANDROID_PLATFORM=android-16