diff --git a/jni/Android.mk b/jni/Android.mk
index bc817026..70030530 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,94 +1,71 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
+CORE_DIR     := $(LOCAL_PATH)/..
+COMMON_DIR   := $(CORE_DIR)/platform/common
+LIBRETRO_DIR := $(CORE_DIR)/platform/libretro
+UNZIP_DIR    := $(CORE_DIR)/unzip
+R            := $(CORE_DIR)/
+FR           := $(R)
+
+SRCS_COMMON :=
+DEFINES     :=
+ARCH        := $(TARGET_ARCH)
+
+use_cyclone  := 0
+use_fame     := 1
+use_musashi  := 0
+use_drz80    := 0
+use_cz80     := 1
+use_sh2drc   := 0
+use_sh2mame  := 1
+use_svpdrc   := 0
+
+asm_memory   := 0
+asm_render   := 0
+asm_ym2612   := 0
+asm_misc     := 0
+asm_cdmemory := 0
+asm_mix      := 0
+
+ifeq ($(TARGET_ARCH),arm)
+  use_cyclone := 1
+  use_sh2drc  := 1
+  use_svpdrc  := 1
+  asm_render  := 1
+  asm_misc    := 1
+  asm_mix     := 1
+  use_fame    := 0
+  use_sh2mame := 0
+endif
+
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+  CYCLONE_CONFIG := cyclone_config_armv4.h
+endif
+
+include $(COMMON_DIR)/common.mak
+
+SOURCES_C := $(LIBRETRO_DIR)/libretro.c \
+             $(COMMON_DIR)/mp3.c \
+             $(COMMON_DIR)/mp3_dummy.c \
+             $(UNZIP_DIR)/unzip.c
+
+COREFLAGS := $(addprefix -D,$(DEFINES)) -fno-strict-aliasing
 
 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
 
-LOCAL_MODULE := retro
+include $(CLEAR_VARS)
+LOCAL_MODULE     := retro
+LOCAL_SRC_FILES  := $(SRCS_COMMON) $(SOURCES_C)
+LOCAL_CFLAGS     := $(COREFLAGS)
+LOCAL_C_INCLUDES := $(CORE_DIR)
+LOCAL_LDFLAGS    := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
+LOCAL_LDLIBS     := -llog -lz
 
-R := ../
-FR := $(LOCAL_PATH)/$(R)
-
-use_cyclone = 0
-use_fame = 0
-use_musashi = 0
-use_drz80 = 0
-use_cz80 = 0
-use_sh2drc = 0
-use_sh2mame = 0
-use_svpdrc = 0
-
-asm_memory = 0
-asm_render = 0
-asm_ym2612 = 0
-asm_misc = 0
-asm_cdmemory = 0
-asm_mix = 0
-
-ifeq ($(TARGET_ARCH),arm)
-  LOCAL_ARM_MODE := arm
-  ifeq ($(NEON_BUILD),1)
-    LOCAL_ARM_NEON := true
-  endif
-
-  use_cyclone = 1
-
-  # texrels, -perf ~~8%
-  use_drz80 = 0
-  use_cz80 = 1
-
-  use_sh2drc = 1
-  use_svpdrc = 1
-
-#  asm_memory = 1 # texrels, -perf negligible
-  asm_render = 1
-#  asm_ym2612 = 1 # texrels, -perf ~~4%
-  asm_misc = 1
-#  asm_cdmemory = 1 # texrels
-  asm_mix = 1
-
-# for armeabi to build...
-CYCLONE_CONFIG = cyclone_config_armv4.h
-
-$(cleantarget)::
-	$(MAKE) -C $(FR)cpu/cyclone/ clean
-
-else
-  use_fame = 1
-  use_cz80 = 1
-  use_sh2mame = 1
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+  LOCAL_ARM_NEON := true
 endif
 
-# PD is currently not strict aliasing safe
-LOCAL_CFLAGS += -fno-strict-aliasing
-
-# sources
-SRCS_COMMON :=
-DEFINES :=
-ARCH := $(TARGET_ARCH)
-include $(R)platform/common/common.mak
-
-LOCAL_SRC_FILES += $(SRCS_COMMON)
-LOCAL_SRC_FILES += $(R)platform/libretro/libretro.c
-LOCAL_SRC_FILES += $(R)platform/common/mp3.c
-LOCAL_SRC_FILES += $(R)platform/common/mp3_dummy.c
-
-# zlib/unzip
-LOCAL_SRC_FILES += $(R)zlib/gzio.c $(R)zlib/inffast.c $(R)zlib/inflate.c \
-	$(R)zlib/inftrees.c $(R)zlib/trees.c $(R)zlib/deflate.c \
-	$(R)zlib/crc32.c $(R)zlib/adler32.c $(R)zlib/zutil.c \
-	$(R)zlib/compress.c $(R)zlib/uncompr.c
-
-LOCAL_SRC_FILES += $(R)unzip/unzip.c
-
-LOCAL_C_INCLUDES += $(R)
-
-# note: don't use -O3, causes some NDKs run out of memory while compiling FAME
-LOCAL_CFLAGS += -Wall -O2 -ffast-math -DNDEBUG
-LOCAL_CFLAGS += $(addprefix -D,$(DEFINES))
-LOCAL_LDLIBS := -llog
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/platform/libretro/link.T b/platform/libretro/link.T
new file mode 100644
index 00000000..b0c262db
--- /dev/null
+++ b/platform/libretro/link.T
@@ -0,0 +1,5 @@
+{
+   global: retro_*;
+   local: *;
+};
+