From d94280b81264e3868d41097aba1f545db348a51b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 4 Aug 2015 04:07:26 +0200
Subject: [PATCH] Create way to copy and rename core properly and output to
 dist/android/{ABI}/ dir

---
 libretro-build-common.sh | 7 +++++--
 libretro-config.sh       | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 662b596e..5106506d 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -64,8 +64,11 @@ build_summary_log() {
 copy_core_to_dist() {
 	[ -z "$1" ] && return 1
 	dest="${2:-$1}"
-	echo_cmd "cp \"$CORE_PREFIX$1$CORE_SUFFIX\" \"$RARCH_DIST_DIR/$dest$CORE_SUFFIX\""
-
+	if [ "$FORMAT_ABI_ANDROID" = "yes" ]; then
+		echo_cmd "cp \"$CORE_PREFIX$1$CORE_SUFFIX\" \"$RARCH_DIST_DIR/${dest}_libretro_android.so\""
+	else
+		echo_cmd "cp \"$CORE_PREFIX$1$CORE_SUFFIX\" \"$RARCH_DIST_DIR/$dest$CORE_SUFFIX\""
+	fi
 	ret=$?
 	build_summary_log $ret "$dest"
 	return $ret
diff --git a/libretro-config.sh b/libretro-config.sh
index 7854e1b5..c8627fa9 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -41,6 +41,7 @@ case "$platform" in
 		FORMAT=.armeabi-v7a
 		FORMAT_COMPILER_TARGET=android-armeabi_v7a
 		FORMAT_COMPILER_TARGET_ALT=android-armeabi_v7a
+		FORMAT_ABI_ANDROID=yes
 		UNAME_PLATFORM="$(uname)"
 		HOST_PLATFORM="linux"