From b4bb32254a21ff0b173c44ecd281588a359ff711 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Fri, 13 Oct 2017 21:43:58 +0200
Subject: [PATCH] kodev: Add $ANDROID_ARCH to enable x86 build (#3353)

You'll still have to call it with `ANDROID_ARCH=x86 ./kodev build/release/run android`.

Don't forget to `./mk-luajit.sh clean` in luajit-launcher when changing architectures.

* Bump android-luajit-launcher
  This includes the fix for Android 8. Fixes #3126.
* Bump base
---
 base                             |  2 +-
 kodev                            | 15 +++++++++++++--
 platform/android/luajit-launcher |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/base b/base
index 709ca9e1e..f0cad8faa 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 709ca9e1e0b365ed5b60cfddd44d5720c218e493
+Subproject commit f0cad8faa0178f6543484e3477e4ef7e49bd02ea
diff --git a/kodev b/kodev
index e5a8d668f..68bb46876 100755
--- a/kodev
+++ b/kodev
@@ -3,6 +3,17 @@
 CURDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 VERSION=$(git describe HEAD)
 
+# Default Android build to arm.
+ANDROID_ARCH=${ANDROID_ARCH:-arm}
+if [ -z "${ANDROID_FULL_ARCH+x}" ]; then
+    if [ "$ANDROID_ARCH" = arm ]; then
+        ANDROID_FULL_ARCH_APK="${ANDROID_FULL_ARCH_APK:-arm-linux-androideabi}"
+    elif [ "$ANDROID_ARCH" = x86 ]; then
+        ANDROID_FULL_ARCH_APK="${ANDROID_FULL_ARCH_APK:-i686-linux-android}"
+    else
+        ANDROID_FULL_ARCH_APK="${ANDROID_ARCH}"
+    fi
+fi
 # Default to Android 4.0+; required for NDK 15 but with a custom NDK the strict minimum is 9.
 NDKABI=${NDKABI:-14}
 export NDKABI
@@ -165,7 +176,7 @@ ${SUPPORTED_TARGETS}"
                     export NDK="${CURDIR}/base/toolchain/android-ndk-r15c"
                 fi
             fi
-            [ -e "${CURDIR}/base/toolchain/android-toolchain/bin/arm-linux-androideabi-gcc" ] || {
+            [ -e "${CURDIR}/base/toolchain/android-toolchain-${ANDROID_ARCH}/bin/" ] || {
                 { [ -e "${NDK}" ] || make -C "${CURDIR}/base/toolchain" android-ndk; }
                 make android-toolchain
                 assert_ret_zero $?
@@ -449,7 +460,7 @@ TARGET:
                 adb logcat -c
                 # uninstall existing package to make sure *everything* is gone from memory
                 adb uninstall "org.koreader.launcher"
-                adb install "koreader-android-arm-linux-androideabi-${VERSION}.apk"
+                adb install "koreader-android-${ANDROID_FULL_ARCH_APK}-${VERSION}.apk"
                 # there's no adb run so we do this…
                 adb shell monkey -p org.koreader.launcher -c android.intent.category.LAUNCHER 1
                 adb logcat
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 336c8ed46..0141a0d04 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 336c8ed46277c95bcffa86058e8db832be1f4ef7
+Subproject commit 0141a0d043fc8758fa8576c467dd2845df5e6e36