chiark
/
gitweb
/
~mdw
/
mdw-cross
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etc/android.sh: Don't expect to find the NDK relative to an SDK path.
[mdw-cross]
/
etc
/
android.sh
diff --git
a/etc/android.sh
b/etc/android.sh
index af7ffd116044bf5e2bd2d37bd2c69d8aef2e3016..d7f96ca886c2f7b713c4ff21cb5c766ff39d631d 100644
(file)
--- a/
etc/android.sh
+++ b/
etc/android.sh
@@
-2,8
+2,7
@@
CROSS_ARCH=$ANDROID_NDK_TARGETARCH
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
: ${ANDROID_NDK_TOOLVER=4.9}
: ${ANDROID_NDK_HOSTARCH=linux-x86_64}
case $ANDROID_NDK_TARGETARCH in