From 4d1706228f359aca36e7e5ed204530ce3193ddd5 Mon Sep 17 00:00:00 2001 From: fr500 Date: Thu, 1 Dec 2016 16:49:33 -0500 Subject: [PATCH] update android recipes --- recipes/android/cores-android-armv7-ndk | 4 ++-- recipes/android/cores-android-armv7-ndk-mame.conf | 6 +++--- recipes/android/cores-android-armv7-ndk.conf | 2 +- recipes/android/cores-android-jni-old.conf | 4 ++-- recipes/android/retroarch-android-staging.conf | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/android/cores-android-armv7-ndk b/recipes/android/cores-android-armv7-ndk index d7946292..742878d9 100644 --- a/recipes/android/cores-android-armv7-ndk +++ b/recipes/android/cores-android-armv7-ndk @@ -1,5 +1,5 @@ +glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC Makefile . +glupen64_gles3 libretro-glupen64-gles3 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC Makefile . platform=android-armv7-gles3 mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile . VRENDER=soft emulator scummvm libretro-scummvm https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build puae libretro-puae https://github.com/libretro/libretro-uae.git PROJECT YES GENERIC Makefile . -glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC Makefile . -glupen64_gles3 libretro-glupen64-gles3 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC Makefile . platform=android-armv7-gles3 diff --git a/recipes/android/cores-android-armv7-ndk-mame.conf b/recipes/android/cores-android-armv7-ndk-mame.conf index 3b1ecf54..3d341f4b 100644 --- a/recipes/android/cores-android-armv7-ndk-mame.conf +++ b/recipes/android/cores-android-armv7-ndk-mame.conf @@ -1,6 +1,6 @@ -PATH /home/buildbot/tools/android/android-ndk-r10e-arm/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/ +PATH /home/buildbot/tools/android/android-ndk-r13b/bin +ANDROID_NDK_ARM /home/buildbot/tools/android/android-ndk-r13b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64 +ANDROID_NDK_ROOT /home/buildbot/tools/android/android-ndk-r13b/ PLATFORM android platform android LIBSUFFIX _android diff --git a/recipes/android/cores-android-armv7-ndk.conf b/recipes/android/cores-android-armv7-ndk.conf index a9f663ed..1aa758fd 100644 --- a/recipes/android/cores-android-armv7-ndk.conf +++ b/recipes/android/cores-android-armv7-ndk.conf @@ -1,4 +1,4 @@ -PATH /home/buildbot/tools/android/android-ndk-r13b-arm/bin +PATH /home/buildbot/tools/android/standalone-r13b-api18-arm/bin/ PLATFORM android-armv7 platform android-armv7 LIBSUFFIX _android diff --git a/recipes/android/cores-android-jni-old.conf b/recipes/android/cores-android-jni-old.conf index 0ef62022..2ac59ef7 100644 --- a/recipes/android/cores-android-jni-old.conf +++ b/recipes/android/cores-android-jni-old.conf @@ -1,7 +1,7 @@ -ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux-old +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-old/tools +PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk-linux/tools PLATFORM android platform android MAKE make diff --git a/recipes/android/retroarch-android-staging.conf b/recipes/android/retroarch-android-staging.conf index cc889e6f..fa8c8713 100644 --- a/recipes/android/retroarch-android-staging.conf +++ b/recipes/android/retroarch-android-staging.conf @@ -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 +PATH /home/buildbot/tools/android/android-ndk-r13b/:/home/buildbot/tools/android/android-sdk-linux/tools PLATFORM android platform android MAKE make