From dc807f25cf33c192ec30d85d378725e7e3b40abe Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Tue, 1 May 2018 13:01:03 -0500 Subject: [PATCH] Fix android armeabi and x86_64 core updater urls --- config.def.h | 6 +++++- pkg/android/phoenix/jni/Android.mk | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h index 546e7bebfd..950bca391d 100644 --- a/config.def.h +++ b/config.def.h @@ -701,12 +701,16 @@ static const unsigned midi_volume = 100; static const bool sustained_performance_mode = false; #if defined(ANDROID) -#if defined(ANDROID_ARM) +#if defined(ANDROID_ARM_V7) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"; +#elif defined(ANDROID_ARM) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi/"; #elif defined(ANDROID_AARCH64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"; #elif defined(ANDROID_X86) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/"; +#elif defined(ANDROID_X64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86_64/"; #else static char buildbot_server_url[] = ""; #endif diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index f3929445ba..a44f14fa8b 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -29,6 +29,10 @@ ifeq ($(TARGET_ARCH),x86) DEFINES += -DANDROID_X86 -DHAVE_SSSE3 endif +ifeq ($(TARGET_ARCH),x86_64) + DEFINES += -DANDROID_X64 +endif + ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(HAVE_NEON),1)