From 39b0f2c654581b13b58c99fb76042a1fd84bdfbc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 4 Aug 2015 04:20:28 +0200
Subject: [PATCH] Add libretro-build-android-armeabi.sh

---
 libretro-build-android-armeabi.sh | 17 ++++++++++++
 libretro-config.sh                | 46 +++++++++++++++++++++++++++----
 2 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100755 libretro-build-android-armeabi.sh

diff --git a/libretro-build-android-armeabi.sh b/libretro-build-android-armeabi.sh
new file mode 100755
index 00000000..5565ec96
--- /dev/null
+++ b/libretro-build-android-armeabi.sh
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+# vim: set ts=3 sw=3 noet ft=sh : bash
+
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
+WORKDIR="$PWD"
+
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
+else
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
+fi
+
+platform=android-armeabi ${BASE_DIR}/libretro-build.sh $@
diff --git a/libretro-config.sh b/libretro-config.sh
index c8627fa9..9e65a840 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -35,18 +35,46 @@ case "$platform" in
 		CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK"
 		;;
 
-   android-armeabi_v7a)
-		DIST_DIR="android/armeabi-v7a"
+   android-armeabi)
+		FORMAT_ABI="armeabi"
+		DIST_DIR="android/${FORMAT_ABI}"
 		FORMAT_EXT=so
-		FORMAT=.armeabi-v7a
+		FORMAT=.${FORMAT_ABI}
+		FORMAT_COMPILER_TARGET=android-${FORMAT_ABI}
+		FORMAT_COMPILER_TARGET_ALT=android-${FORMAT_ABI}
+		FORMAT_ABI_ANDROID=yes
+		UNAME_PLATFORM="$(uname)"
+		HOST_PLATFORM="linux"
+
+		case "$UNAME_PLATFORM" in
+			osx|*Darwin*)
+				HOST_PLATFORM="darwin"
+				;;
+			win|*mingw32*|*MINGW32*|*MSYS_NT*)
+				HOST_PLATFORM="windows"
+				;;
+			win64|*mingw64*|*MINGW64*)
+				HOST_PLATFORM="windows"
+				;;
+		esac
+		export NDK_ROOT_DIR
+		echo ${NDK_ROOT_DIR}
+		CC="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-gcc"
+		CXX="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-g++"
+		CXX11="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-g++"
+		;;
+
+   android-armeabi_v7a)
+		FORMAT_ABI="armeabi-v7a"
+		DIST_DIR="android/${FORMAT_ABI}"
+		FORMAT_EXT=so
+		FORMAT=.${FORMAT_ABI}
 		FORMAT_COMPILER_TARGET=android-armeabi_v7a
 		FORMAT_COMPILER_TARGET_ALT=android-armeabi_v7a
 		FORMAT_ABI_ANDROID=yes
 		UNAME_PLATFORM="$(uname)"
 		HOST_PLATFORM="linux"
 
-		echo $UNAME_PLATFORM
-
 		case "$UNAME_PLATFORM" in
 			osx|*Darwin*)
 				HOST_PLATFORM="darwin"
@@ -245,10 +273,16 @@ case "$platform" in
 					FORMAT_COMPILER_TARGET="ngc"
 					DIST_DIR="ngc"
 					;;
+				android-armeabi)
+					platform=android-armeabi
+					FORMAT_EXT="so"
+					FORMAT_COMPILER_TARGET="${platform}"
+					DIST_DIR="android/armeabi"
+					;;
 				android-armeabi_v7a)
 					platform=android-armeabi_v7a
 					FORMAT_EXT="so"
-					FORMAT_COMPILER_TARGET="android-armeabi_v7a"
+					FORMAT_COMPILER_TARGET="${platform}"
 					DIST_DIR="android/armeabi-v7a"
 					;;
 				theos_ios*)