From 61b11b94312390c63843b77274a95156be7ab3ba Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Wed, 28 Mar 2018 22:57:07 -0500
Subject: [PATCH] Strip android cmake output

This checks for the STRIPPATH varible in the android path. Only
setting that variable for the android cmake targets. JNI outputs
already stripped shared objects.
---
 libretro-buildbot-recipe.sh                      | 2 ++
 recipes/android/cores-android-cmake-aarch64.conf | 1 +
 recipes/android/cores-android-cmake-armv7.conf   | 1 +
 recipes/android/cores-android-cmake-x86.conf     | 1 +
 4 files changed, 5 insertions(+)

diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index cd8b4646..5d4a0e40 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -396,6 +396,8 @@ build_libretro_generic_makefile() {
 
 		if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then
 			${STRIP:=strip} -s ${OUT}/${CORENAM}
+		elif [ "${PLATFORM}" = "android" -a ! -z "${STRIPPATH+x}" ]; then
+			${NDK_ROOT}/${STRIPPATH} -s ${OUT}/${CORENAM}
 		fi
 
 		echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
diff --git a/recipes/android/cores-android-cmake-aarch64.conf b/recipes/android/cores-android-cmake-aarch64.conf
index 1733cbeb..6b5993ac 100644
--- a/recipes/android/cores-android-cmake-aarch64.conf
+++ b/recipes/android/cores-android-cmake-aarch64.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE arm64-v8a
 API_LEVEL 21
 CMAKE cmake
+STRIPPATH toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip
diff --git a/recipes/android/cores-android-cmake-armv7.conf b/recipes/android/cores-android-cmake-armv7.conf
index 5bea25d0..01cd72d0 100644
--- a/recipes/android/cores-android-cmake-armv7.conf
+++ b/recipes/android/cores-android-cmake-armv7.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE armeabi-v7a
 API_LEVEL 9
 CMAKE cmake
+STRIPPATH toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
diff --git a/recipes/android/cores-android-cmake-x86.conf b/recipes/android/cores-android-cmake-x86.conf
index 644088c5..f31a15b9 100644
--- a/recipes/android/cores-android-cmake-x86.conf
+++ b/recipes/android/cores-android-cmake-x86.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE x86
 API_LEVEL 9
 CMAKE cmake
+STRIPPATH toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-strip