Refactor android jni makefiles

1 files changed, 15 insertions, 29 deletions

diff --git a/jni/Android.mk b/jni/Android.mk
index e832e41..e5cf6e3 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,38 +1,24 @@
 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
-
-CORE_DIR     := ../source
-LIBRETRO_DIR := ..
+ROOT_DIR     := $(LOCAL_PATH)/..
+CORE_DIR     := $(ROOT_DIR)/source
+LIBRETRO_DIR := $(ROOT_DIR)
 
-DEBUG                 = 0
-PERF_TEST             = 0
-LOAD_FROM_MEMORY_TEST = 1
-USE_BLARGG_APU        = 0
-
-LOCAL_MODULE    := retro
+LOAD_FROM_MEMORY_TEST := 1
+FLAGS :=
 
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM
-LOCAL_ARM_MODE := arm
-endif
+include $(ROOT_DIR)/Makefile.common
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS +=  -DANDROID_X86
-endif
+COREFLAGS := -ffast-math $(FLAGS)
 
-ifeq ($(TARGET_ARCH),mips)
-LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-include ../Makefile.common
-
-LOCAL_SRC_FILES += $(SOURCES_C)
-LOCAL_CFLAGS    += -std=gnu99 -ffast-math $(FLAGS)
-
+include $(CLEAR_VARS)
+LOCAL_MODULE    := retro
+LOCAL_SRC_FILES := $(SOURCES_C)
+LOCAL_CFLAGS    := $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
 include $(BUILD_SHARED_LIBRARY)