From 5ddd4946d213fcf5592a5297dc2c20be79101431 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Tue, 3 Apr 2018 09:27:24 -0500 Subject: [PATCH 1/2] Remove core-android-jni-old These cores have been added to the current ndk recipe --- recipes/android/cores-android-jni-old | 3 --- recipes/android/cores-android-jni-old.conf | 11 ----------- 2 files changed, 14 deletions(-) delete mode 100644 recipes/android/cores-android-jni-old delete mode 100644 recipes/android/cores-android-jni-old.conf diff --git a/recipes/android/cores-android-jni-old b/recipes/android/cores-android-jni-old deleted file mode 100644 index 1c2da754..00000000 --- a/recipes/android/cores-android-jni-old +++ /dev/null @@ -1,3 +0,0 @@ -nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni -quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC_JNI Makefile jni -bluemsx libretro-bluemsx-old https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni diff --git a/recipes/android/cores-android-jni-old.conf b/recipes/android/cores-android-jni-old.conf deleted file mode 100644 index 2ac59ef7..00000000 --- a/recipes/android/cores-android-jni-old.conf +++ /dev/null @@ -1,11 +0,0 @@ -ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux -NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e/ -ANDROID_NDK /home/buildbot/tools/android/android-ndk-r10e/ -PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk-linux/tools -PLATFORM android -platform android -MAKE make -NDK ndk-build -RA NO -LIBSUFFIX _android -CORE_JOB YES From 3bcc1dbb5b522c9e94e3c6fac2bc04ffcab423cc Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Tue, 3 Apr 2018 11:06:34 -0500 Subject: [PATCH 2/2] Mesen properly builds for android using gcc on the newer ndk --- recipes/android/cores-android-jni | 1 + recipes/android/cores-android-jni_clang | 1 - recipes/android/cores-android-jni_clang.conf | 13 ------------- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 recipes/android/cores-android-jni_clang delete mode 100644 recipes/android/cores-android-jni_clang.conf diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni index 58361a42..03184e57 100644 --- a/recipes/android/cores-android-jni +++ b/recipes/android/cores-android-jni @@ -42,6 +42,7 @@ mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetl mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC_JNI Makefile jni mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC_JNI Makefile jni melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC_JNI Makefile jni +mesen libretro-mesen https://github.com/libretro/Mesen.git master YES GENERIC_JNI Makefile Libretro/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 diff --git a/recipes/android/cores-android-jni_clang b/recipes/android/cores-android-jni_clang deleted file mode 100644 index 4441062d..00000000 --- a/recipes/android/cores-android-jni_clang +++ /dev/null @@ -1 +0,0 @@ -mesen libretro-mesen https://github.com/libretro/Mesen.git master YES GENERIC_JNI Makefile Libretro/jni NDK_DEBUG=1 diff --git a/recipes/android/cores-android-jni_clang.conf b/recipes/android/cores-android-jni_clang.conf deleted file mode 100644 index 3bc5a406..00000000 --- a/recipes/android/cores-android-jni_clang.conf +++ /dev/null @@ -1,13 +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 -NDK_TOOLCHAIN_VERSION clang -RA NO -LIBSUFFIX _android -CORE_JOB YES -CMAKE cmake