From 6f173b35c963ed131293a898b156c6b51c2c0fe6 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 27 Sep 2016 02:56:42 +0200
Subject: Rearrange files for new_dynarec

---
 jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 36b0c93..a0dbec3 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -27,7 +27,7 @@ ifeq ($(TARGET_ARCH),arm)
    LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S
 
    # dynarec
-   LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/linkage_arm.S ../libpcsxcore/new_dynarec/emu_if.c ../libpcsxcore/new_dynarec/pcsxmem.c
+   LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/arm/linkage_arm.S ../libpcsxcore/new_dynarec/backends/psx/emu_if.c ../libpcsxcore/new_dynarec/backends/psx/pcsxmem.c
 
    # spu
    LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S
-- 
cgit v1.2.3


From f02594f5c7ec18b8a6c6fd3802e199f07478a744 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 29 Sep 2016 02:45:28 +0200
Subject: Define NO_WRITE_EXEC for Android

---
 jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index a0dbec3..43a98da 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -95,7 +95,7 @@ LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.c
 # libretro
 LOCAL_SRC_FILES += ../frontend/libretro.c
 
-LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565
+LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 LOCAL_LDLIBS := -lz -llog
 
-- 
cgit v1.2.3


From 8fc5171a4c53b6f0e7ef7247d36ee5e05eaf0a07 Mon Sep 17 00:00:00 2001
From: Gregor Richards
Date: Fri, 9 Dec 2016 19:56:33 -0500
Subject: Report git version with library_version

---
 jni/Android.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 43a98da..9dd9e39 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,6 +2,11 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
 APP_DIR := ../../src
 
 #fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
-- 
cgit v1.2.3