Refactor android jni makefiles

jni/Android.mk

@@ -1,62 +1,35 @@
 LOCAL_PATH := $(call my-dir)
-DEBUG = 0
-FRONTEND_SUPPORTS_RGB565 = 1
-FAST = 1
 
-include $(CLEAR_VARS)
+CORE_DIR := $(LOCAL_PATH)/..
 
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
-ifneq ($(GIT_VERSION)," unknown")
-	LOCAL_CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-endif
-
-ifeq ($(TARGET_ARCH),arm)
-ANDROID_FLAGS := -DANDROID_ARM
-LOCAL_ARM_MODE := arm
-endif
+DEBUG                    := 0
+FRONTEND_SUPPORTS_RGB565 := 1
+NEED_BPP                 := 32
+NEED_BLIP                := 1
+NEED_STEREO_SOUND        := 1
+NEED_CRC32               := 1
+IS_X86                   := 0
+FLAGS                    :=
 
 ifeq ($(TARGET_ARCH),x86)
-ANDROID_FLAGS := -DANDROID_X86
-IS_X86 = 1
-endif
-
-ifeq ($(TARGET_ARCH),mips)
-ANDROID_FLAGS := -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+  IS_X86 := 1
 endif
 
-LOCAL_CXXFLAGS += $(ANDROID_FLAGS)
-LOCAL_CFLAGS   += $(ANDROID_FLAGS)
-
-CORE_DIR        := ..
-LOCAL_MODULE    := libretro
+include $(CORE_DIR)/Makefile.common
 
-core = lynx
-NEED_BPP = 32
-NEED_BLIP = 1
-NEED_STEREO_SOUND = 1
-CORE_DEFINE := -DWANT_LYNX_EMU
-NEED_CRC32 = 1
+COREFLAGS := -funroll-loops $(INCFLAGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -D__LIBRETRO__ -D_LOW_ACCURACY_ -DINLINE="inline" $(FLAGS)
+COREFLAGS += -DWANT_LYNX_EMU
 
-TARGET_NAME := mednafen_lynx_libretro
-
-include ../Makefile.common
-
-LOCAL_SRC_FILES += $(SOURCES_CXX) $(SOURCES_C)
-EXTRA_GCC_FLAGS := -funroll-loops
-
-ifeq ($(DEBUG),0)
-   FLAGS += -O3 $(EXTRA_GCC_FLAGS)
-else
-   FLAGS += -O0 -g
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-LDFLAGS += $(fpic) $(SHARED)
-FLAGS += $(fpic) $(NEW_GCC_FLAGS) $(INCFLAGS)
-
-FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ $(SOUND_DEFINE)
-
-LOCAL_CFLAGS =  $(FLAGS) 
-LOCAL_CXXFLAGS += $(FLAGS) -fexceptions
-LOCAL_LDLIBS := -latomic
-
+include $(CLEAR_VARS)
+LOCAL_MODULE       := retro
+LOCAL_SRC_FILES    := $(SOURCES_CXX) $(SOURCES_C)
+LOCAL_CFLAGS       := $(COREFLAGS)
+LOCAL_CXXFLAGS     := $(COREFLAGS)
+LOCAL_LDFLAGS      := -Wl,-version-script=$(CORE_DIR)/link.T
+LOCAL_CPP_FEATURES := exceptions
 include $(BUILD_SHARED_LIBRARY)