Refactor android jni makefiles

Author: webgeek1234

jni/Android.mk

@@ -1,40 +1,24 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
+CORE_DIR := $(LOCAL_PATH)/..
+
+include $(CORE_DIR)/Makefile.common
 
-GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
+COREFLAGS := $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) -ffast-math -funroll-loops -Dstricmp=strcasecmp -DANDROID $(INCFLAGS)
+
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
-	LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
+include $(CLEAR_VARS)
 LOCAL_MODULE    := retro
+LOCAL_SRC_FILES := $(SOURCES_C)
+LOCAL_CFLAGS    := -std=gnu99 $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/link.T
 
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM
-LOCAL_ARM_MODE := arm
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_CFLAGS += -D__ARM_NEON__ -mfpu=neon
-endif
-endif
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS +=  -DANDROID_X86
+  LOCAL_ARM_NEON := true
 endif
 
-ifeq ($(TARGET_ARCH),mips)
-LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
-endif
-
-CORE_ROOT_DIR := ..
-CORE_DIR      := $(CORE_ROOT_DIR)
-
-include $(CORE_ROOT_DIR)/Makefile.common
-
-LOCAL_SRC_FILES    += $(SOURCES_C)
-
-LOCAL_C_INCLUDES = $(INCFLAGS)
-
-LOCAL_CFLAGS += $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS)
-LOCAL_CFLAGS += -O3 -std=gnu99 -ffast-math -funroll-loops -Dstricmp=strcasecmp -DANDROID $(INCFLAGS)
-
 include $(BUILD_SHARED_LIBRARY)