Merge android cmake recipes into the main recipes

Use the new android_cmake build type to reduce recipe redundancy.
aarch64 is retained until a simple way to provide an abi list to
the new build type is found.
This commit is contained in:
Aaron Kling 2019-05-27 00:01:05 -05:00
parent c10bf7bbb5
commit 3f63104594
9 changed files with 4 additions and 40 deletions

View File

@ -84,6 +84,7 @@ 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
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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,16 +0,0 @@
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 armeabi-v7a
LIBSUFFIX _android
CORE_JOB YES
ABI_OVERRIDE armeabi-v7a
API_LEVEL 14
CMAKE cmake
STRIPPATH toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip

View File

@ -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

View File

@ -1,16 +0,0 @@
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
DIST x86
CORE_JOB YES
ABI_OVERRIDE x86
API_LEVEL 14
CMAKE cmake
STRIPPATH toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-strip

View File

@ -7,4 +7,5 @@ mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64
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