From a9e63cd52677e07d101a594e2ab457396719dc80 Mon Sep 17 00:00:00 2001 From: Matt Lewandowsky Date: Thu, 24 Mar 2016 02:23:36 -0700 Subject: [PATCH] Add default OS X NDK root The standard NDK installed by Android Studio on OS X lives at $HOME/Library/Android/sdk/ndk-bundle. As this is a well-known location that seems unlikely to change, it makes sense to auto-detect it. --- setenv-android.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setenv-android.sh b/setenv-android.sh index b94a08fc..3d4c351c 100755 --- a/setenv-android.sh +++ b/setenv-android.sh @@ -63,6 +63,9 @@ if [ -z "$ANDROID_NDK_ROOT" ]; then if [ -z "$ANDROID_NDK_ROOT" ]; then ANDROID_NDK_ROOT=$(find $HOME -maxdepth 1 -type d -name android-ndk-r10* 2>/dev/null | tail -1) fi + if [ -d "$HOME/Library/Android/sdk/ndk-bundle" ]; then + ANDROID_NDK_ROOT="$HOME/Library/Android/sdk/ndk-bundle" + fi fi # Error checking