etc/android.sh: Don't expect to find the NDK relative to an SDK path.
authorMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 18:59:22 +0000 (19:59 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 18:59:22 +0000 (19:59 +0100)
Establishing a simple well-known path to the NDK root covers all the
possibilities.

etc/android.sh

index af7ffd1..d7f96ca 100644 (file)
@@ -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