From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 22 Apr 2020 18:59:22 +0000 (+0100)
Subject: etc/android.sh: Don't expect to find the NDK relative to an SDK path.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mdw-cross/commitdiff_plain/1509948dd756bbed37bc37e956405f838ecc2391

etc/android.sh: Don't expect to find the NDK relative to an SDK path.

Establishing a simple well-known path to the NDK root covers all the
possibilities.
---

diff --git a/etc/android.sh b/etc/android.sh
index af7ffd1..d7f96ca 100644
--- a/etc/android.sh
+++ b/etc/android.sh
@@ -2,8 +2,7 @@
 
 CROSS_ARCH=$ANDROID_NDK_TARGETARCH
 
-: ${ANDROID_SDK=/usr/local/android/sdk}
-: ${ANDROID_NDK=$ANDROID_SDK/ndk-bundle}
+: ${ANDROID_NDK=/usr/local/android/ndk}
 : ${ANDROID_NDK_TOOLVER=4.9}
 : ${ANDROID_NDK_HOSTARCH=linux-x86_64}
 case $ANDROID_NDK_TARGETARCH in