Merge pull request #5026 from fr500/staging

AARCH64 support

config.def.h

@@ -572,6 +572,8 @@ static const bool ui_companion_enable = false;
 #if defined(ANDROID)
 #if defined(ANDROID_ARM)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
+#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/";
 #else

input/drivers/android_input.c

@@ -466,10 +466,15 @@ static bool android_input_init_handle(void)
 {
    if (libandroid_handle != NULL) /* already initialized */
       return true;
-
+#ifdef ANDROID_AARCH64
+   if ((libandroid_handle = dlopen("/system/lib64/libandroid.so",
+               RTLD_LOCAL | RTLD_LAZY)) == 0)
+   return false;
+#else
    if ((libandroid_handle = dlopen("/system/lib/libandroid.so",
                RTLD_LOCAL | RTLD_LAZY)) == 0)
-      return false;
+   return false;
+#endif
 
    if ((p_AMotionEvent_getAxisValue = dlsym(RTLD_DEFAULT,
                "AMotionEvent_getAxisValue")))

pkg/android/phoenix/jni/Android.mk

@@ -42,6 +42,10 @@ DEFINES += -DSINC_LOWER_QUALITY
 DEFINES += -DANDROID_ARM_V7
 endif
 
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+   DEFINES += -DANDROID_AARCH64
+endif
+
 ifeq ($(TARGET_ARCH),mips)
    DEFINES += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
 endif