From c78a0dd39b5a65d73a8d5eb462918e1b28847a7b Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 11 Dec 2014 01:38:47 +0100
Subject: (Android) For Android x86 build - try to use mmap, for Android - use
 ARM_MEMORY_DYNAREC codepath

---
 cpu_threaded.c | 2 +-
 jni/Android.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu_threaded.c b/cpu_threaded.c
index 3526dc1..6da6d62 100644
--- a/cpu_threaded.c
+++ b/cpu_threaded.c
@@ -30,7 +30,7 @@ u8* bios_translation_cache;
 u8 *rom_translation_ptr;
 u8 *ram_translation_ptr;
 u8 *bios_translation_ptr;
-#elif defined(ANDROID)
+#elif defined(ARM_MEMORY_DYNAREC)
 __asm__(".section .jit,\"awx\",%progbits");
 
 u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]
diff --git a/jni/Android.mk b/jni/Android.mk
index fd7be21..442daa9 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -6,14 +6,14 @@ LOCAL_MODULE    := retro
 CPU_ARCH        :=
 
 ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH
+LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH -DARM_MEMORY_DYNAREC
 LOCAL_ARM_MODE := arm
 CPU_ARCH := arm
 HAVE_DYNAREC := 1
 endif
 
 ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS +=  -DANDROID_X86
+LOCAL_CFLAGS +=  -DANDROID_X86 -DHAVE_MMAP
 CPU_ARCH := x86_32
 HAVE_DYNAREC := 1
 endif
-- 
cgit v1.2.3