From d082d9c34a0906ac0dbb6675dd499274a7dba4d2 Mon Sep 17 00:00:00 2001
From: Aaron Kling
Date: Wed, 11 Apr 2018 11:27:48 -0500
Subject: Refactor android jni makefiles

---
 jni/Android.mk | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 324a646..bb8d209 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,32 +1,25 @@
 LOCAL_PATH := $(call my-dir)
 
-ARM_ASM  = 0
-SOURCES :=
-DEFINES :=
-COMMON_DEFINES :=
-
-include $(CLEAR_VARS)
+ROOT_DIR     := $(LOCAL_PATH)/..
+CORE_DIR     := $(ROOT_DIR)/src
+LIBRETRO_DIR := $(ROOT_DIR)/libretro
 
-LOCAL_MODULE    := retro
+ARM_ASM        := 0
+DEFINES        :=
+COMMON_DEFINES :=
 
 ifeq ($(TARGET_ARCH),arm)
-ARM_ASM         = 1
-ASM_CPU         = 0
-ASM_SPC700      = 0
-LOCAL_ARM_MODE := arm
+  ARM_ASM := 1
 endif
 
-ifeq ($(NDK_DEBUG),1)
-DEBUG = 1
-endif
-
-CORE_DIR     := ../src
-LIBRETRO_DIR := ../libretro
+include $(ROOT_DIR)/Makefile.common
 
-include ../Makefile.common
+COREFLAGS := $(DEFINES) $(COMMON_DEFINES) $(INCLUDES)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE    := retro
 LOCAL_SRC_FILES := $(SOURCES)
-LOCAL_CFLAGS    += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) -std=c99
-LOCAL_ASFLAGS   += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES)
-
+LOCAL_CFLAGS    := -std=c99 $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
+LOCAL_ARM_MODE  := arm
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3