ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #771 from webgeek1234/master 

Android aarch64 unification
This commit is contained in:
Twinaphex 2018-04-03 04:23:31 +02:00 committed by GitHub
parent a462f46062 e67f890eb4
commit b2f9b05005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-buildbot-recipe.sh
View File

@ -949,7 +949,7 @@ EOF
android update project --path . --target android-24 | tee -a "$LOGFILE"
android update project --path libs/googleplay --target android-24 | tee -a "$LOGFILE"
android update project --path libs/appcompat --target android-24 | tee -a "$LOGFILE"
ant release | tee -a "$LOGFILE"
TARGET_ABIS=${TARGET_ABIS/arm64-v8a /} ant release | tee -a "$LOGFILE"
if [ -z "$BRANCH" ]; then
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk

2
libretro-config.sh
View File

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

2
recipes/android/cores-android-armv7-ndk
View File

@ -1,4 +1,2 @@
mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC Makefile .
mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC Makefile . platform=android-armv7-gles3
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
scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build

9
recipes/android/cores-android-jni
View File

@ -2,9 +2,10 @@
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
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
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_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
caprice libretro-caprice https://github.com/libretro/libretro-cap32.git YES GENERIC_JNI Makefile.libretro jni
caprice libretro-caprice https://github.com/libretro/libretro-cap32.git master YES GENERIC_JNI Makefile.libretro jni
craft libretro-craft https://github.com/libretro/Craft.git master YES GENERIC_JNI Makefile.libretro jni
crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC_JNI Makefile jni
desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni
@ -27,7 +28,7 @@ handy libretro-handy https://github.com/libretro/libretro-handy.git master YES G
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/arcades/mame2003-plus-libretro.git master YES GENERIC_JNI Makefile jni
mame2003-plus libretro-mame2003-plus https://github.com/libretro-mirrors/mame2003-plus-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
@ -43,7 +44,10 @@ 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
meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master YES GENERIC_JNI Makefile libretro/jni
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.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
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/AZO234/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
@ -59,6 +63,7 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC_JNI Makefile jni
puae libretro-puae https://github.com/libretro/libretro-uae.git master YES GENERIC_JNI Makefile jni
px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC_JNI Makefile.libretro libretro/jni
quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC_JNI Makefile jni
sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/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

77
recipes/android/cores-android-jni-aarch64
View File

@ -1,77 +0,0 @@
2048 libretro64-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC_JNI Makefile jni
3dengine libretro64-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC_JNI Makefile jni
4do libretro64-4do https://github.com/libretro/4do-libretro.git master YES GENERIC_JNI Makefile jni
atari800 libretro64-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC_JNI Makefile jni
bluemsx libretro64-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni
bsnes libretro64-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_mercury libretro64-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
snes9x2002 libretro64-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni
snes9x2005 libretro64-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni
snes9x2010 libretro64-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_JNI Makefile jni
snes9x libretro64-snes9x https://github.com/libretro/snes9x.git master YES GENERIC_JNI Makefile libretro/jni
snes9x2010 libretro64-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_JNI Makefile jni
craft libretro64-craft https://github.com/libretro/Craft.git master YES GENERIC_JNI Makefile.libretro jni
crocods libretro64-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC_JNI Makefile jni
desmume2015 libretro64-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni
dolphin libretro64-dolphin https://github.com/libretro/dolphin.git master YES GENERIC_JNI Makefile.libretro Source/Core/DolphinLibretro/jni
dinothawr libretro64-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC_JNI Makefile jni
dosbox libretro64-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC_JNI Makefile.libretro jni
fbalpha libretro64-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC_JNI makefile.libretro jni
fbalpha2012 libretro64-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni
fceumm libretro64-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC_JNI Makefile.libretro jni
fmsx libretro64-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC_JNI Makefile jni
gambatte libretro64-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC_JNI Makefile libgambatte/libretro/jni
gearboy libretro-gearboy https://github.com/libretro/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 libretro64-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC_JNI Makefile.libretro libretro/jni
gme libretro64-gme https://github.com/libretro/libretro-gme.git master YES GENERIC_JNI Makefile jni
gpsp libretro64-gpsp https://github.com/libretro/gpsp.git master YES GENERIC_JNI Makefile jni
handy libretro64-handy https://github.com/libretro/libretro-handy.git master YES GENERIC_JNI Makefile jni
lutro libretro64-lutro https://github.com/libretro/libretro-lutro.git master YES GENERIC_JNI Makefile jni
mednafen_gba libretro64-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_lynx libretro64-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_ngp libretro64-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_pce_fast libretro64-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_pcfx libretro64-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_psx libretro64-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_psx_hw libretro64-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC_JNI Makefile parallel-psx/jni
mednafen_saturn libretro64-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_snes libretro64-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_supergrafx libretro64-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_vb libretro64-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC_JNI Makefile jni
mednafen_wswan libretro64-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC_JNI Makefile jni
melonds libretro64-melonds https://github.com/libretro/melonDS.git master YES GENERIC_JNI Makefile jni
meteor libretro64-meteor https://github.com/libretro/meteor-libretro.git master YES GENERIC_JNI Makefile libretro/jni
mame2003 libretro64-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC_JNI Makefile jni
mame2003-plus libretro64-mame2003-plus https://github.com/arcadez/mame2003-plus-libretro.git master YES GENERIC_JNI Makefile jni
mame2000 libretro64-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC_JNI Makefile jni
mrboom libretro64-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC_JNI Makefile jni
nekop2 libretro64-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC_JNI Makefile.libretro libretro/jni
np2kai libretro64-np2kai https://github.com/AZO234/NP2kai.git master YES GENERIC_JNI Makefile.libretro jni
parallel_n64 libretro64-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_JNI Makefile jni
nxengine libretro64-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC_JNI Makefile jni
o2em libretro64-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC_JNI Makefile jni
openlara libretro64-openlara https://github.com/libretro/OpenLara.git master YES GENERIC_JNI Makefile src/platform/libretro/jni
pcsx_rearmed libretro64-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro jni
pcsx_rearmed_interpreter libretro64-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro . USE_DYNAREC=0
pocketcdg libretro64-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC_JNI Makefile jni
picodrive libretro64-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni
pokemini libretro64-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC_JNI Makefile jni
prboom libretro64-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_JNI Makefile jni
prosystem libretro64-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC_JNI Makefile jni
px68k libretro64-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC_JNI Makefile.libretro libretro/jni
sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/jni
stella libretro64-stella https://github.com/libretro/stella-libretro.git master YES GENERIC_JNI Makefile jni
tgbdual libretro64-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
tyrquake libretro64-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni
vba_next libretro64-vba-next https://github.com/libretro/vba-next.git master YES GENERIC_JNI Makefile libretro/jni
vbam libretro64-vbam https://github.com/libretro/vbam-libretro.git master YES GENERIC_JNI Makefile src/libretro/jni
vecx libretro64-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC_JNI Makefile.libretro jni
virtualjaguar libretro64-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master YES GENERIC_JNI Makefile jni
vice_x64 libretro64-vice https://github.com/libretro/vice-libretro.git master YES GENERIC_JNI Makefile jni
xrick libretro64-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC_JNI Makefile jni
yabause libretro64-yabause https://github.com/libretro/yabause.git master YES GENERIC_JNI Makefile libretro/jni
uzem libretro64-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni
nestopia libretro64-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni
quicknes libretro64-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC_JNI Makefile jni
puae libretro-puae https://github.com/libretro/libretro-uae.git master YES GENERIC_JNI Makefile jni

13
recipes/android/cores-android-jni-aarch64.conf
View File

@ -1,13 +0,0 @@
ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
NDK_ROOT /home/buildbot/tools/android/android-ndk-r15c/
ANDROID_NDK /home/buildbot/tools/android/android-ndk-r15c/
PATH /home/buildbot/tools/android/android-ndk-r15c:/home/buildbot/tools/android/android-sdk-linux/tools
PLATFORM android
platform android
MAKE make
NDK ndk-build
NDK_TOOLCHAIN_VERSION 4.9
RA NO
LIBSUFFIX _android
CORE_JOB YES
ABI_OVERRIDE arm64-v8a

6
recipes/android/cores-android-jni.conf
View File

@ -1,7 +1,7 @@
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
NDK_ROOT /home/buildbot/tools/android/android-ndk-r15c/
ANDROID_NDK /home/buildbot/tools/android/android-ndk-r15c/
PATH /home/buildbot/tools/android/android-ndk-r15c:/home/buildbot/tools/android/android-sdk-linux/tools
PLATFORM android
platform android
MAKE make