Revert "Revert "Android updates""

libretro-buildbot-recipe.sh

@@ -373,22 +373,19 @@ build_libretro_generic_makefile() {
 
 		echo '--------------------------------------------------' | tee -a "$LOGFILE"
 		if [ "${COMMAND}" = "CMAKE" ]; then
-			if [ "${PLATFORM}" = "android" ]; then
+			case "${platform}" in
-				EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
+				msvc2017_desktop_x86 ) EXTRAARGS="-G\"Visual Studio 15 2017\"" ;;
-					-DANDROID_ABI=${ABI_OVERRIDE} \
+				msvc2017_desktop_x64 ) EXTRAARGS="-G\"Visual Studio 15 2017 Win64\"" ;;
-					-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
+				msvc2010_x86 ) EXTRAARGS="-G\"Visual Studio 10 2010\"" ;;
-			else
+				msvc2010_x64 ) EXTRAARGS="-G\"Visual Studio 10 2010 Win64\"" ;;
-				case "${platform}" in
+				msvc2005_x86 ) EXTRAARGS="-G\"Visual Studio 8 2005\"" ;;
-					msvc2017_desktop_x86 ) EXTRAARGS="-G\"Visual Studio 15 2017\"" ;;
+				msvc2005_x64 ) EXTRAARGS="-G\"Visual Studio 8 2005 Win64\"" ;;
-					msvc2017_desktop_x64 ) EXTRAARGS="-G\"Visual Studio 15 2017 Win64\"" ;;
+				msvc2003_x86 ) EXTRAARGS="-G\"Visual Studio 7\"" ;;
-					msvc2010_x86 ) EXTRAARGS="-G\"Visual Studio 10 2010\"" ;;
+				android ) EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
-					msvc2010_x64 ) EXTRAARGS="-G\"Visual Studio 10 2010 Win64\"" ;;
+								-DANDROID_ABI=${ABI_OVERRIDE} \
-					msvc2005_x86 ) EXTRAARGS="-G\"Visual Studio 8 2005\"" ;;
+								-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake" ;;
-					msvc2005_x64 ) EXTRAARGS="-G\"Visual Studio 8 2005 Win64\"" ;;
+				* ) EXTRAARGS="" ;;
-					msvc2003_x86 ) EXTRAARGS="-G\"Visual Studio 7\"" ;;
+			esac
-					* ) EXTRAARGS="" ;;
-				esac
-			fi			
 
 			JOBS_FLAG=-j
 			if [ "${MAKEFILE}" = "sln" ]; then
@@ -443,6 +440,71 @@ build_libretro_generic_makefile() {
 	ENTRY_ID=""
 }
 
+build_libretro_android_cmake() {
+	NAME="$1"
+	DIR="$2"
+	SUBDIR="$3"
+	MAKEFILE="$4"
+	PLATFORM="$5"
+	ARGS="$6"
+
+	JOBS_FLAG=-j
+	EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} -DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static"
+
+	if [ -n "NDK_CCACHE" ]; then
+		EXTRAARGS="$EXTRAARGS -DCMAKE_C_COMPILER_LAUNCHER=${NDK_CCACHE} -DCMAKE_CXX_COMPILER_LAUNCHER=${NDK_CCACHE}"
+	fi
+
+	ENTRY_ID=""
+	if [ -n "$LOGURL" ]; then
+		ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="$NAME" http://buildbot.fiveforty.net/build_entry/`
+	fi
+
+	cd ${DIR}
+	mkdir -p ${SUBDIR}
+	cd ${SUBDIR}
+
+	CORENAM="${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
+
+	LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log"
+	echo '--------------------------------------------------' | tee "$LOGFILE"
+	cat $TMPDIR/vars | tee -a "$LOGFILE"
+
+	echo '--------------------------------------------------' | tee -a "$LOGFILE"
+	RET=0
+	for ABI in ${TARGET_ABIS}; do
+		rm -rf ${ABI}
+		mkdir	${ABI}
+		pushd ${ABI}
+
+		eval "set -- ${EXTRAARGS} \${ARGS} -DCMAKE_VERBOSE_MAKEFILE=OFF -DANDROID_ABI=${ABI}"
+		echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE"
+		echo "$@" ../.. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE"
+
+		echo "BUILD CMD: ${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE"
+		${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE"
+
+		COREPATH=$(find . -type f -name ${CORENAM})
+		if [ -n "${COREPATH}" ]; then
+			echo "COPY CMD: cp ${COREPATH} $RARCH_DIST_DIR/${ABI}/${CORENAM}" 2>&1 | tee -a "$LOGFILE"
+			cp ${COREPATH} $RARCH_DIST_DIR/${ABI}/${CORENAM} 2>&1 | tee -a "$LOGFILE"
+
+			if [ ! -z "${STRIPPATH+x}" ]; then
+				${NDK_ROOT}/${STRIPPATH} -s $RARCH_DIST_DIR/${ABI}/${CORENAM}
+			fi
+		else
+			echo "${CORENAM} for ${ABI} not found" 2>&1 | tee -a "$LOGFILE"
+			RET=1
+		fi
+
+		popd
+	done
+
+	buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$LOGFILE"
+
+	ENTRY_ID=""
+}
+
 build_libretro_generic_jni() {
 	NAME="$1"
 	DIR="$2"
@@ -667,6 +729,7 @@ while read line; do
 		CORES_BUILT=YES
 		echo "buildbot job: building $NAME"
 		case "${COMMAND}" in
+			ANDROID_CMAKE ) build_libretro_android_cmake $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;;
 			CMAKE|GENERIC|GENERIC_GL )
 			              build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" "${CORES}" ;;
 			GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" "${CORES}"  ;;
@@ -992,33 +1055,18 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 		echo "buildbot job: $jobid Building"
 		echo
 		cd pkg/android/phoenix$PKG_EXTRA
-		rm bin/*.apk
-
-cat << EOF > local.properties
-sdk.dir=/home/buildbot/tools/android/android-sdk-linux
-key.store=/home/buildbot/.android/release.keystore
-key.alias=buildbot
-key.store.password=buildbot
-key.alias.password=buildbot
-
-EOF
 
 		git reset --hard
 		if [ "${RELEASE}" == "NO" ]; then
 			python ./version_increment.py
 		fi
-		ant clean | tee -a "$LOGFILE"
+		./gradlew clean assembleRelease
-		android update project --path . --target android-26 | tee -a "$LOGFILE"
+		cp -r build/outputs/apk/normal/release/phoenix-normal-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
-		android update project --path libs/googleplay --target android-26 | tee -a "$LOGFILE"
+		cp -r build/outputs/apk/normal/release/phoenix-normal-release.apk $RARCH_DIR/retroarch-release.apk
-		android update project --path libs/appcompat --target android-26 | tee -a "$LOGFILE"
+		cp -r build/outputs/apk/aarch64/release/phoenix-aarch64-release.apk $RARCH_DIR/retroarch-aarch64-release.apk | tee -a "$LOGFILE"
-		TARGET_ABIS=${TARGET_ABIS/arm64-v8a /} ant release | tee -a "$LOGFILE"
+		cp -r build/outputs/apk/aarch64/release/phoenix-aarch64-release.apk $RARCH_DIR/retroarch-aarch64-release.apk
-		if [ -z "$BRANCH" ]; then
+		cp -r build/outputs/apk/ra32/release/phoenix-ra32-release.apk $RARCH_DIR/retroarch-ra32-release.apk | tee -a "$LOGFILE"
-			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
+		cp -r build/outputs/apk/ra32/release/phoenix-ra32-release.apk $RARCH_DIR/retroarch-ra32-release.apk
-			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk
-		else
-			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE"
-			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk
-		fi
 
 		RET=$?
 		buildbot_handle_message "$RET" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"

libretro-config.sh

@@ -43,7 +43,7 @@ export BUILD_LIBRETRO_GL=1
 #ANDROID DEFINES
 #================
 
-export TARGET_ABIS="armeabi armeabi-v7a arm64-v8a x86 x86_64"
+export TARGET_ABIS="armeabi-v7a arm64-v8a x86 x86_64"
 
 #uncomment to define NDK standalone toolchain for ARM
 #export NDK_ROOT_DIR_ARM = 

recipes/android/cores-android

@@ -1,11 +1,10 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC_JNI Makefile jni
-3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC_JNI Makefile jni
+81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC_JNI Makefile build/jni
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC_JNI Makefile jni
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni
 bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC_JNI Makefile libretro/jni
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC_JNI Makefile target-libretro/jni | bsnes_accuracy:profile=accuracy bsnes_balanced:profile=balanced bsnes_performance:profile=performance
-bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC_JNI Makefile jni
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC_JNI Makefile target-libretro/jni | bsnes_mercury_accuracy:profile=accuracy bsnes_mercury_balanced:profile=balanced bsnes_mercury_performance:profile=performance
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC_JNI Makefile jni
 daphne libretro-daphne https://github.com/libretro/daphne.git master YES GENERIC_JNI Makefile jni
@@ -17,27 +16,32 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC_JNI Makefile jni
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC_JNI Makefile.libretro jni
-easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC_JNI Makefile.libretro builds/libretro/jni
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC_JNI Makefile.libretro libretro/jni
+dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/libretro/dosbox-svn glide YES GENERIC_JNI Makefile.libretro libretro/jni
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
 fbalpha2012_neogeo libretro-fbalpha2012_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC_JNI Makefile src/burner/libretro/jni
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC_JNI Makefile.libretro jni
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC_JNI Makefile jni
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC_JNI Makefile jni
-frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC_JNI Makefile jni
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master NO GENERIC_JNI Makefile jni
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC_JNI Makefile build/jni
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC_JNI Makefile libgambatte/libretro/jni
 gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC_JNI Makefile platforms/libretro/jni
 gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC_JNI Makefile platforms/libretro/jni
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC_JNI Makefile.libretro libretro/jni
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC_JNI Makefile jni
-gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC_JNI Makefile jni
+gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC_JNI Makefile build/jni
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC_JNI Makefile jni
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC_JNI Makefile.libretro libretro/jni
+kronos libretro-kronos https://github.com/libretro/yabause.git kronos YES GENERIC_JNI Makefile yabause/src/libretro/jni
 lutro libretro-lutro https://github.com/libretro/libretro-lutro.git master YES GENERIC_JNI Makefile jni
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC_JNI Makefile jni
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC_JNI Makefile jni
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC_JNI Makefile jni
+mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC_JNI Makefile jni
 mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC_JNI Makefile jni
 mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC_JNI Makefile jni
 mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC_JNI Makefile jni
@@ -54,20 +58,17 @@ mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-li
 melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC_JNI Makefile jni
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC_JNI Makefile Libretro/jni
 meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO GENERIC_JNI Makefile libretro/jni
+mgba libretro-mgba https://github.com/libretro/mgba.git master YES ANDROID_CMAKE Makefile build -DBUILD_LIBRETRO=ON -DANDROID_PLATFORM=19
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC_JNI Makefile jni
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC_JNI Makefile libretroBuildSystem/jni
-mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_JNI Makefile libretro/jni
-mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni GLES3=1 APP_PLATFORM=android-18
+mupen64plus_next_gles3 libretro-mupen64plus_next-gles3 https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_JNI Makefile libretro/jni GLES3=1
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC_JNI Makefile.libretro libretro/jni
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC_JNI Makefile.libretro jni
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC_JNI Makefile jni
 o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC_JNI Makefile jni
-openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC_JNI Makefile src/platform/libretro/jni
+openlara libretro-openlara https://github.com/libretro/OpenLara.git master NO GENERIC_JNI Makefile src/platform/libretro/jni
-parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_JNI Makefile jni
-pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro jni
-picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni
 pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC_JNI Makefile jni
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC_JNI Makefile jni
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_JNI Makefile jni
@@ -81,7 +82,6 @@ reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/jni
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC_JNI Makefile backends/platform/libretro/build/jni
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC_JNI Makefile libretro/jni
-snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_JNI Makefile jni
@@ -90,6 +90,8 @@ stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.g
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC_JNI Makefile src/libretro/jni
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC_JNI Makefile jni
+thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES ANDROID_CMAKE Makefile build
+tic80 libretro-tic80 https://github.com/RobLoach/TIC-80.git libretro YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni
 vba_next libretro-vba-next https://github.com/libretro/vba-next.git master YES GENERIC_JNI Makefile libretro/jni
@@ -103,3 +105,4 @@ vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git maste
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master YES GENERIC_JNI Makefile jni
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC_JNI Makefile jni
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC_JNI Makefile libretro/jni
+yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC_JNI Makefile yabause/src/libretro/jni

recipes/android/cores-android-aarch64

@@ -0,0 +1,2 @@
+dolphin libretro-dolphin-aarch64 https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON
+ishiiruka libretro-ishiiruka-aarch64 https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON

recipes/android/cores-android-aarch64.conf

@@ -0,0 +1,16 @@
+ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
+NDK_ROOT /home/buildbot/tools/android/android-ndk-r20/
+ANDROID_NDK /home/buildbot/tools/android/android-ndk-r20/
+PATH /home/buildbot/tools/android/android-ndk-r20:/home/buildbot/tools/android/android-sdk-linux/tools
+PLATFORM android
+platform android
+MAKE make
+NDK ndk-build
+RA NO
+DIST arm64-v8a
+LIBSUFFIX _android
+CORE_JOB YES
+ABI_OVERRIDE arm64-v8a
+API_LEVEL 21
+CMAKE cmake
+STRIPPATH toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip

recipes/android/cores-android-armv7-ndk

@@ -1 +0,0 @@
-mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=0 CC=arm-linux-androideabi-gcc CXX=arm-linux-androideabi-g++ LD=arm-linux-androideabi-g++ platform=android emulator

recipes/android/cores-android-armv7-ndk-old-mame

@@ -1,2 +0,0 @@
-mame2015 libretro-mame2015o https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume
-mame2016 libretro-mame2016o https://github.com/libretro/mame2016-libretro master YES GENERIC makefile . OSD=retro RETRO=1 NOWERROR=1 NOASM=1 gcc=android-arm gcc_version=4.9 TARGETOS=android-arm CONFIG=libretro NO_USE_MIDI=1 OS=linux VERBOSE=1 verbose=1 OVERRIDE_CC=/home/buildbot/tools/android/android-ndk-r10e/toolchains/llvm-3.5/prebuilt/linux-x86_64/bin/clang OVERRIDE_CXX=/home/buildbot/tools/android/android-ndk-r10e/toolchains/llvm-3.5/prebuilt/linux-x86_64/bin/clang++ TARGET=mame

recipes/android/cores-android-armv7-ndk-old-mame.conf

@@ -1,10 +0,0 @@
-PATH home/buildbot/tools/android/android-ndk-r10e/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/
-ANDROID_NDK_ARM /home/buildbot/tools/android/android-ndk-r10e/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/
-ANDROID_NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e/
-ANDROID_NDK_LLVM /home/buildbot/tools/android/android-ndk-r10e/toolchains/llvm-3.5/prebuilt/linux-x86_64/
-PLATFORM android
-platform android
-LIBSUFFIX _android
-MAKE make
-DIST armeabi-v7a
-CORE_JOB YES

recipes/android/cores-android-armv7-ndk.conf

@@ -1,6 +0,0 @@
-PATH /home/buildbot/tools/android/standalone-r13b-api18-arm/bin/
-PLATFORM android-armv7
-platform android-armv7
-LIBSUFFIX _android
-MAKE make
-CORE_JOB YES

recipes/android/cores-android-cmake-aarch64

@@ -1,4 +0,0 @@
-dolphin libretro-dolphin-aarch64 https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
-ishiiruka libretro-ishiiruka-aarch64 https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
-ppsspp libretro-ppsspp-aarch64 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
-thepowdertoy libretro-thepowdertoy-aarch64 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release

recipes/android/cores-android-cmake-aarch64.conf

@@ -1,16 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/
-PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools
-PLATFORM android
-platform android
-MAKE make
-NDK ndk-build
-RA NO
-DIST arm64-v8a
-LIBSUFFIX _android
-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

recipes/android/cores-android-cmake-armv7

@@ -1,2 +0,0 @@
-ppsspp libretro-ppsspp-armv7 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DANDROID_ARM_MODE=arm -DCMAKE_BUILD_TYPE=Release
-thepowdertoy libretro-thepowdertoy-armv7 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release

recipes/android/cores-android-cmake-armv7.conf

@@ -1,16 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/
-PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools
-PLATFORM android
-platform android
-MAKE make
-NDK ndk-build
-RA NO
-DIST armeabi-v7a
-LIBSUFFIX _android
-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

recipes/android/cores-android-cmake-x86

@@ -1,2 +0,0 @@
-ppsspp libretro-ppsspp-x86 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
-thepowdertoy libretro-thepowdertoy-x86 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release

recipes/android/cores-android-cmake-x86.conf

@@ -1,16 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/
-PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools
-PLATFORM android
-platform android
-MAKE make
-NDK ndk-build
-RA NO
-LIBSUFFIX _android
-DIST x86
-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

recipes/android/cores-android-cross

@@ -1,5 +0,0 @@
-81 libretro64-81 https://github.com/libretro/81-libretro.git master YES LEIRADEL Makefile build | 81:armeabi 81:armeabi-v7a 81:arm64-v8a 81:x86
-emux libretro64-emux https://github.com/libretro/emux master YES LEIRADEL Makefile libretro | "emux_chip8:armeabi MACHINE=chip8" "emux_chip8:armeabi-v7a MACHINE=chip8" "emux_chip8:arm64-v8a MACHINE=chip8" "emux_chip8:x86 MACHINE=chip8" "emux_gb:armeabi MACHINE=gb" "emux_gb:armeabi-v7a MACHINE=gb" "emux_gb:arm64-v8a MACHINE=gb" "emux_gb:x86 MACHINE=gb" "emux_nes:armeabi MACHINE=nes" "emux_nes:armeabi-v7a MACHINE=nes" "emux_nes:arm64-v8a MACHINE=nes" "emux_nes:x86 MACHINE=nes" "emux_sms:armeabi MACHINE=sms" "emux_sms:armeabi-v7a MACHINE=sms" "emux_sms:arm64-v8a MACHINE=sms" "emux_sms:x86 MACHINE=sms"
-fuse libretro64-fuse https://github.com/libretro/fuse-libretro.git master YES LEIRADEL Makefile build | fuse:armeabi fuse:armeabi-v7a fuse:arm64-v8a fuse:x86
-gw libretro64-gw https://github.com/libretro/gw-libretro.git master YES LEIRADEL Makefile build | gw:armeabi gw:armeabi-v7a gw:arm64-v8a gw:x86
-mgba libretro64-mgba https://github.com/libretro/mgba.git master YES LEIRADEL Makefile libretro-build | mgba:armeabi mgba:armeabi-v7a mgba:arm64-v8a mgba:x86

recipes/android/cores-android-cross.conf

@@ -1,11 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r13b/
-NDK_ROOT_DIR /home/buildbot/tools/android/android-ndk-r13b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r13b/
-PATH /home/buildbot/tools/android/android-ndk-r13b:/home/buildbot/tools/android/android-sdk/tools
-PLATFORM android
-platform android
-MAKE make
-NDK_TOOLCHAIN_VERSION 4.9
-LIBSUFFIX _android
-CORE_JOB YES

recipes/android/cores-android-jni-new

@@ -1,4 +0,0 @@
-dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC_JNI Makefile.libretro libretro/jni
-dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/libretro/dosbox-svn glide YES GENERIC_JNI Makefile.libretro libretro/jni
-fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC_JNI Makefile src/burner/libretro/jni
-yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC_JNI Makefile yabause/src/libretro/jni

recipes/android/cores-android-jni-new.conf

@@ -1,12 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r18b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r18b/
-PATH /home/buildbot/tools/android/android-ndk-r18b:/home/buildbot/tools/android/android-sdk-linux/tools
-PLATFORM android
-platform android
-MAKE make
-NDK ndk-build
-RA NO
-LIBSUFFIX _android
-CORE_JOB YES
-CMAKE cmake

recipes/android/cores-android-r16b

@@ -0,0 +1,11 @@
+3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni
+bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC_JNI Makefile jni
+easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC_JNI Makefile.libretro builds/libretro/jni
+gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC_JNI Makefile jni
+mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni
+mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni GLES3=1 APP_PLATFORM=android-18
+pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro jni
+picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni
+parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_JNI Makefile jni
+ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES ANDROID_CMAKE Makefile build -DLIBRETRO=ON
+snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni

recipes/android/cores-android.conf

@@ -0,0 +1,12 @@
+ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
+NDK_ROOT /home/buildbot/tools/android/android-ndk-r20/
+ANDROID_NDK /home/buildbot/tools/android/android-ndk-r20/
+PATH /home/buildbot/tools/android/android-ndk-r20:/home/buildbot/tools/android/android-sdk-linux/tools
+PLATFORM android
+platform android
+MAKE make
+NDK ndk-build
+RA NO
+LIBSUFFIX _android
+CORE_JOB YES
+CMAKE cmake

recipes/android/retroarch-android-aarch64

@@ -1 +0,0 @@
-

recipes/android/retroarch-android-aarch64.conf

@@ -1,14 +0,0 @@
-ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r13b/
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r13b/
-PATH /home/buildbot/tools/android/android-ndk-r13b/:/home/buildbot/tools/android/android-sdk-linux/tools
-PLATFORM android
-platform android
-MAKE make
-NDK ndk-build
-RA YES
-LIBSUFFIX _android
-JAVA_HOME /usr/lib/jvm/java-8-oracle
-TARGET_ABIS arm64-v8a
-BRANCH aarch64
-PKG_EXTRA 64

recipes/android/retroarch-android-aarch64.ra

@@ -1,7 +0,0 @@
-retroarch retroarch-aarch64 https://github.com/libretro/Retroarch.git PROJECT YES .
-overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch-aarch64/media
-shaders shaders_glsl https://github.com/libretro/glsl-shaders.git ASSETS YES retroarch-aarch64/media
-autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch-aarch64/media
-assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch-aarch64/media
-libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch-aarch64/media
-

recipes/android/retroarch-android.conf

@@ -1,11 +1,7 @@
 ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
-NDK_ROOT /home/buildbot/tools/android/android-ndk-r13b/
+PATH /home/buildbot/tools/android/android-sdk-linux/tools/bin
-ANDROID_NDK /home/buildbot/tools/android/android-ndk-r13b/
-PATH /home/buildbot/tools/android/android-ndk-r13b/:/home/buildbot/tools/android/android-sdk-linux/tools
 PLATFORM android
 platform android
 MAKE make
-NDK ndk-build
 RA YES
 LIBSUFFIX _android
-JAVA_HOME /usr/lib/jvm/java-8-oracle