From cf01bb7985f82593554bed43335eb84f88dd3ba1 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 27 Oct 2019 16:43:19 -0700 Subject: [PATCH] Ensure proper setting of Android 64bit flags --- Android/jni/jnihooks.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Android/jni/jnihooks.c b/Android/jni/jnihooks.c index d1c6924c..050a90bf 100644 --- a/Android/jni/jnihooks.c +++ b/Android/jni/jnihooks.c @@ -123,8 +123,9 @@ static void discover_cpu_family(void) { AndroidCpuFamily family = android_getCpuFamily(); uint64_t features = android_getCpuFeatures(); - if (family == ANDROID_CPU_FAMILY_X86) { - android_x86 = true; + if (family == ANDROID_CPU_FAMILY_X86 || family == ANDROID_CPU_FAMILY_X86_64) { + android_x86 = (family == ANDROID_CPU_FAMILY_X86); + android_x86_64 = (family == ANDROID_CPU_FAMILY_X86_64); if (features & ANDROID_CPU_X86_FEATURE_SSSE3) { LOG("nANDROID_CPU_X86_FEATURE_SSSE3"); android_x86SSSE3Enabled = true; @@ -155,9 +156,7 @@ static void discover_cpu_family(void) { LOG("ANDROID_CPU_ARM_FEATURE_LDREX_STREX"); } } else if (family == ANDROID_CPU_FAMILY_ARM64) { -#warning FIXME TODO ... - //android_arm64Arch = true; - android_armArchV7A = true; + android_arm64Arch = true; } }