Rearrange everything.

[mdw-cross] / etc / android.sh

diff --git a/etc/android.sh b/etc/android.sh
index 5e1f1b0..1df89a7 100644 (file)
--- a/etc/android.sh
+++ b/etc/android.sh
@@ -1,5 +1,7 @@
 ### -*-sh-*-
 
+CROSS_ARCH=$ANDROID_NDK_TARGETARCH
+
 : ${ANDROID_SDK=/usr/local/android/sdk}
 : ${ANDROID_NDK=$ANDROID_SDK/ndk-bundle}
 : ${ANDROID_NDK_TOOLVER=4.9}
@@ -25,13 +27,10 @@ case $ANDROID_NDK_TARGETARCH in
     ANDROID_NDK_TARGETSHORTARCH=x86_64
     : ${ANDROID_NDK_TARGETVER=21}
     ;;
+  *)
+    echo 2>&1 "${0##*/}: unexpected Android arch \`$ANDROID_NDK_TARGETARCH'"
+    exit 2
+    ;;
 esac
 : ${ANDROID_NDK_TOOLS=$ANDROID_NDK/toolchains/$ANDROID_NDK_TARGETARCHDIR-$ANDROID_NDK_TOOLVER/prebuilt/$ANDROID_NDK_HOSTARCH/bin}
 : ${ANDROID_NDK_SYSROOT=$ANDROID_NDK/platforms/android-$ANDROID_NDK_TARGETVER/arch-$ANDROID_NDK_TARGETSHORTARCH}
-
-ANDROID_CC="$ANDROID_NDK_TARGETARCH-gcc \
-       --sysroot=$ANDROID_NDK_SYSROOT \
-       -D__ANDROID_API__=$ANDROID_NDK_TARGETVER \
-       -isystem $ANDROID_NDK/sysroot/usr/include \
-       -isystem $ANDROID_NDK/sysroot/usr/include/$ANDROID_NDK_TARGETARCH \
-       -fPIE -pie"