Skip to content

Commit 82eafb6

Browse files
authored
Revert "Revert "Android updates""
1 parent 121a317 commit 82eafb6

26 files changed

+144
-185
lines changed

Diff for: libretro-buildbot-recipe.sh

+86-38
Original file line numberDiff line numberDiff line change
@@ -373,22 +373,19 @@ build_libretro_generic_makefile() {
373373

374374
echo '--------------------------------------------------' | tee -a "$LOGFILE"
375375
if [ "${COMMAND}" = "CMAKE" ]; then
376-
if [ "${PLATFORM}" = "android" ]; then
377-
EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
378-
-DANDROID_ABI=${ABI_OVERRIDE} \
379-
-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
380-
else
381-
case "${platform}" in
382-
msvc2017_desktop_x86 ) EXTRAARGS="-G\"Visual Studio 15 2017\"" ;;
383-
msvc2017_desktop_x64 ) EXTRAARGS="-G\"Visual Studio 15 2017 Win64\"" ;;
384-
msvc2010_x86 ) EXTRAARGS="-G\"Visual Studio 10 2010\"" ;;
385-
msvc2010_x64 ) EXTRAARGS="-G\"Visual Studio 10 2010 Win64\"" ;;
386-
msvc2005_x86 ) EXTRAARGS="-G\"Visual Studio 8 2005\"" ;;
387-
msvc2005_x64 ) EXTRAARGS="-G\"Visual Studio 8 2005 Win64\"" ;;
388-
msvc2003_x86 ) EXTRAARGS="-G\"Visual Studio 7\"" ;;
389-
* ) EXTRAARGS="" ;;
390-
esac
391-
fi
376+
case "${platform}" in
377+
msvc2017_desktop_x86 ) EXTRAARGS="-G\"Visual Studio 15 2017\"" ;;
378+
msvc2017_desktop_x64 ) EXTRAARGS="-G\"Visual Studio 15 2017 Win64\"" ;;
379+
msvc2010_x86 ) EXTRAARGS="-G\"Visual Studio 10 2010\"" ;;
380+
msvc2010_x64 ) EXTRAARGS="-G\"Visual Studio 10 2010 Win64\"" ;;
381+
msvc2005_x86 ) EXTRAARGS="-G\"Visual Studio 8 2005\"" ;;
382+
msvc2005_x64 ) EXTRAARGS="-G\"Visual Studio 8 2005 Win64\"" ;;
383+
msvc2003_x86 ) EXTRAARGS="-G\"Visual Studio 7\"" ;;
384+
android ) EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
385+
-DANDROID_ABI=${ABI_OVERRIDE} \
386+
-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake" ;;
387+
* ) EXTRAARGS="" ;;
388+
esac
392389

393390
JOBS_FLAG=-j
394391
if [ "${MAKEFILE}" = "sln" ]; then
@@ -443,6 +440,71 @@ build_libretro_generic_makefile() {
443440
ENTRY_ID=""
444441
}
445442

443+
build_libretro_android_cmake() {
444+
NAME="$1"
445+
DIR="$2"
446+
SUBDIR="$3"
447+
MAKEFILE="$4"
448+
PLATFORM="$5"
449+
ARGS="$6"
450+
451+
JOBS_FLAG=-j
452+
EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} -DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static"
453+
454+
if [ -n "NDK_CCACHE" ]; then
455+
EXTRAARGS="$EXTRAARGS -DCMAKE_C_COMPILER_LAUNCHER=${NDK_CCACHE} -DCMAKE_CXX_COMPILER_LAUNCHER=${NDK_CCACHE}"
456+
fi
457+
458+
ENTRY_ID=""
459+
if [ -n "$LOGURL" ]; then
460+
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/`
461+
fi
462+
463+
cd ${DIR}
464+
mkdir -p ${SUBDIR}
465+
cd ${SUBDIR}
466+
467+
CORENAM="${NAME}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}"
468+
469+
LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log"
470+
echo '--------------------------------------------------' | tee "$LOGFILE"
471+
cat $TMPDIR/vars | tee -a "$LOGFILE"
472+
473+
echo '--------------------------------------------------' | tee -a "$LOGFILE"
474+
RET=0
475+
for ABI in ${TARGET_ABIS}; do
476+
rm -rf ${ABI}
477+
mkdir ${ABI}
478+
pushd ${ABI}
479+
480+
eval "set -- ${EXTRAARGS} \${ARGS} -DCMAKE_VERBOSE_MAKEFILE=OFF -DANDROID_ABI=${ABI}"
481+
echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE"
482+
echo "$@" ../.. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE"
483+
484+
echo "BUILD CMD: ${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE"
485+
${CMAKE} --build . --target ${NAME}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE"
486+
487+
COREPATH=$(find . -type f -name ${CORENAM})
488+
if [ -n "${COREPATH}" ]; then
489+
echo "COPY CMD: cp ${COREPATH} $RARCH_DIST_DIR/${ABI}/${CORENAM}" 2>&1 | tee -a "$LOGFILE"
490+
cp ${COREPATH} $RARCH_DIST_DIR/${ABI}/${CORENAM} 2>&1 | tee -a "$LOGFILE"
491+
492+
if [ ! -z "${STRIPPATH+x}" ]; then
493+
${NDK_ROOT}/${STRIPPATH} -s $RARCH_DIST_DIR/${ABI}/${CORENAM}
494+
fi
495+
else
496+
echo "${CORENAM} for ${ABI} not found" 2>&1 | tee -a "$LOGFILE"
497+
RET=1
498+
fi
499+
500+
popd
501+
done
502+
503+
buildbot_handle_message "$RET" "$ENTRY_ID" "$NAME" "$jobid" "$LOGFILE"
504+
505+
ENTRY_ID=""
506+
}
507+
446508
build_libretro_generic_jni() {
447509
NAME="$1"
448510
DIR="$2"
@@ -667,6 +729,7 @@ while read line; do
667729
CORES_BUILT=YES
668730
echo "buildbot job: building $NAME"
669731
case "${COMMAND}" in
732+
ANDROID_CMAKE ) build_libretro_android_cmake $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;;
670733
CMAKE|GENERIC|GENERIC_GL )
671734
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" "${CORES}" ;;
672735
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
9921055
echo "buildbot job: $jobid Building"
9931056
echo
9941057
cd pkg/android/phoenix$PKG_EXTRA
995-
rm bin/*.apk
996-
997-
cat << EOF > local.properties
998-
sdk.dir=/home/buildbot/tools/android/android-sdk-linux
999-
key.store=/home/buildbot/.android/release.keystore
1000-
key.alias=buildbot
1001-
key.store.password=buildbot
1002-
key.alias.password=buildbot
1003-
1004-
EOF
10051058

10061059
git reset --hard
10071060
if [ "${RELEASE}" == "NO" ]; then
10081061
python ./version_increment.py
10091062
fi
1010-
ant clean | tee -a "$LOGFILE"
1011-
android update project --path . --target android-26 | tee -a "$LOGFILE"
1012-
android update project --path libs/googleplay --target android-26 | tee -a "$LOGFILE"
1013-
android update project --path libs/appcompat --target android-26 | tee -a "$LOGFILE"
1014-
TARGET_ABIS=${TARGET_ABIS/arm64-v8a /} ant release | tee -a "$LOGFILE"
1015-
if [ -z "$BRANCH" ]; then
1016-
cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
1017-
cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk
1018-
else
1019-
cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE"
1020-
cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk
1021-
fi
1063+
./gradlew clean assembleRelease
1064+
cp -r build/outputs/apk/normal/release/phoenix-normal-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
1065+
cp -r build/outputs/apk/normal/release/phoenix-normal-release.apk $RARCH_DIR/retroarch-release.apk
1066+
cp -r build/outputs/apk/aarch64/release/phoenix-aarch64-release.apk $RARCH_DIR/retroarch-aarch64-release.apk | tee -a "$LOGFILE"
1067+
cp -r build/outputs/apk/aarch64/release/phoenix-aarch64-release.apk $RARCH_DIR/retroarch-aarch64-release.apk
1068+
cp -r build/outputs/apk/ra32/release/phoenix-ra32-release.apk $RARCH_DIR/retroarch-ra32-release.apk | tee -a "$LOGFILE"
1069+
cp -r build/outputs/apk/ra32/release/phoenix-ra32-release.apk $RARCH_DIR/retroarch-ra32-release.apk
10221070

10231071
RET=$?
10241072
buildbot_handle_message "$RET" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"

Diff for: libretro-config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export BUILD_LIBRETRO_GL=1
4343
#ANDROID DEFINES
4444
#================
4545

46-
export TARGET_ABIS="armeabi armeabi-v7a arm64-v8a x86 x86_64"
46+
export TARGET_ABIS="armeabi-v7a arm64-v8a x86 x86_64"
4747

4848
#uncomment to define NDK standalone toolchain for ARM
4949
#export NDK_ROOT_DIR_ARM =

Diff for: recipes/android/cores-android-jni renamed to recipes/android/cores-android

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC_JNI Makefile jni
2-
3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni
32
4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC_JNI Makefile jni
3+
81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC_JNI Makefile build/jni
44
atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC_JNI Makefile jni
55
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni
66
bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC_JNI Makefile libretro/jni
77
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
8-
bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC_JNI Makefile jni
98
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
109
cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC_JNI Makefile jni
1110
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
1716
desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni
1817
dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC_JNI Makefile jni
1918
dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC_JNI Makefile.libretro jni
20-
easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC_JNI Makefile.libretro builds/libretro/jni
19+
dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC_JNI Makefile.libretro libretro/jni
20+
dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/libretro/dosbox-svn glide YES GENERIC_JNI Makefile.libretro libretro/jni
2121
fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni
2222
fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
2323
fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
2424
fbalpha2012_neogeo libretro-fbalpha2012_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC_JNI makefile.libretro projectfiles/libretro-android/jni
25+
fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC_JNI Makefile src/burner/libretro/jni
2526
fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC_JNI Makefile.libretro jni
2627
fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC_JNI Makefile jni
2728
freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC_JNI Makefile jni
28-
frodo libretro-frodo https://github.com/libretro/frodo-libretro.git master YES GENERIC_JNI Makefile jni
29+
frodo libretro-frodo https://github.com/libretro/frodo-libretro.git master NO GENERIC_JNI Makefile jni
30+
fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC_JNI Makefile build/jni
2931
gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC_JNI Makefile libgambatte/libretro/jni
3032
gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC_JNI Makefile platforms/libretro/jni
3133
gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC_JNI Makefile platforms/libretro/jni
3234
genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC_JNI Makefile.libretro libretro/jni
3335
gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC_JNI Makefile jni
34-
gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC_JNI Makefile jni
36+
gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC_JNI Makefile build/jni
3537
handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC_JNI Makefile jni
3638
hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC_JNI Makefile.libretro libretro/jni
39+
kronos libretro-kronos https://github.com/libretro/yabause.git kronos YES GENERIC_JNI Makefile yabause/src/libretro/jni
3740
lutro libretro-lutro https://github.com/libretro/libretro-lutro.git master YES GENERIC_JNI Makefile jni
3841
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC_JNI Makefile jni
3942
mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC_JNI Makefile jni
4043
mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC_JNI Makefile jni
44+
mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC_JNI Makefile jni
4145
mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC_JNI Makefile jni
4246
mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC_JNI Makefile jni
4347
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
5458
melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC_JNI Makefile jni
5559
mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC_JNI Makefile Libretro/jni
5660
meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO GENERIC_JNI Makefile libretro/jni
61+
mgba libretro-mgba https://github.com/libretro/mgba.git master YES ANDROID_CMAKE Makefile build -DBUILD_LIBRETRO=ON -DANDROID_PLATFORM=19
5762
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC_JNI Makefile jni
5863
mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC_JNI Makefile libretroBuildSystem/jni
59-
mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni
6064
mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_JNI Makefile libretro/jni
61-
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
65+
mupen64plus_next_gles3 libretro-mupen64plus_next-gles3 https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_JNI Makefile libretro/jni GLES3=1
6266
nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC_JNI Makefile.libretro libretro/jni
6367
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni
6468
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC_JNI Makefile.libretro jni
6569
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC_JNI Makefile jni
6670
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC_JNI Makefile jni
67-
openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC_JNI Makefile src/platform/libretro/jni
68-
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_JNI Makefile jni
69-
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro jni
70-
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni
71+
openlara libretro-openlara https://github.com/libretro/OpenLara.git master NO GENERIC_JNI Makefile src/platform/libretro/jni
7172
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC_JNI Makefile jni
7273
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC_JNI Makefile jni
7374
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
8182
sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/jni
8283
scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC_JNI Makefile backends/platform/libretro/build/jni
8384
snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC_JNI Makefile libretro/jni
84-
snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni
8585
snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni
8686
snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni USE_BLARGG_APU=1
8787
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
9090
stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC_JNI Makefile src/libretro/jni
9191
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
9292
theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC_JNI Makefile jni
93+
thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES ANDROID_CMAKE Makefile build
94+
tic80 libretro-tic80 https://github.com/RobLoach/TIC-80.git libretro YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF
9395
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni
9496
uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni
9597
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
103105
virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master YES GENERIC_JNI Makefile jni
104106
xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC_JNI Makefile jni
105107
yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC_JNI Makefile libretro/jni
108+
yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC_JNI Makefile yabause/src/libretro/jni

Diff for: recipes/android/cores-android-aarch64

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

Diff for: recipes/android/cores-android-aarch64.conf

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
2+
NDK_ROOT /home/buildbot/tools/android/android-ndk-r20/
3+
ANDROID_NDK /home/buildbot/tools/android/android-ndk-r20/
4+
PATH /home/buildbot/tools/android/android-ndk-r20:/home/buildbot/tools/android/android-sdk-linux/tools
5+
PLATFORM android
6+
platform android
7+
MAKE make
8+
NDK ndk-build
9+
RA NO
10+
DIST arm64-v8a
11+
LIBSUFFIX _android
12+
CORE_JOB YES
13+
ABI_OVERRIDE arm64-v8a
14+
API_LEVEL 21
15+
CMAKE cmake
16+
STRIPPATH toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip

Diff for: recipes/android/cores-android-armv7-ndk

-1
This file was deleted.

Diff for: recipes/android/cores-android-armv7-ndk-old-mame

-2
This file was deleted.

0 commit comments

Comments
 (0)