From 451c49ab7a69034e230914245e495756f14f0df1 Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Tue, 19 Jun 2018 20:42:24 -0400
Subject: [PATCH] Libretro: Integrate Android makefile update from
 libretro/Mesen fork

---
 Libretro/jni/Android.mk | 60 ++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/Libretro/jni/Android.mk b/Libretro/jni/Android.mk
index 39986085..e9d52469 100644
--- a/Libretro/jni/Android.mk
+++ b/Libretro/jni/Android.mk
@@ -1,47 +1,27 @@
 LOCAL_PATH := $(call my-dir)
 
-LIBRETRO_DIR := ../
-SEVENZIP_DIR := ../../SevenZip
-LUA_DIR      := ../../Lua
-CORE_DIR     := ../../Core
-UTIL_DIR     := ../../Utilities
+ROOT_DIR     := $(LOCAL_PATH)/../..
+CORE_DIR     := $(ROOT_DIR)/Core
+LIBRETRO_DIR := $(ROOT_DIR)/Libretro
+SEVENZIP_DIR := $(ROOT_DIR)/SevenZip
+UTIL_DIR     := $(ROOT_DIR)/Utilities
 
-INCFLAGS     :=
-SOURCES_C    :=
-SOURCES_CXX  :=
+HAVE_NETWORK := 1
+
+include $(LIBRETRO_DIR)/Makefile.common
+
+COREFLAGS := -DLIBRETRO
+
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
 
 include $(CLEAR_VARS)
-
-GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
-ifneq ($(GIT_VERSION)," unknown")
-   LOCAL_CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-endif
-
-HAVE_NETWORK = 1
-LOCAL_MODULE    := libretro
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CXXFLAGS += -DANDROID_ARM
-LOCAL_ARM_MODE := arm
-endif
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CXXFLAGS +=  -DANDROID_X86
-endif
-
-ifeq ($(TARGET_ARCH),mips)
-LOCAL_CXXFLAGS += -DANDROID_MIPS
-endif
-
-include ../Makefile.common
-
-COREFLAGS := -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLIBRETRO -DNDEBUG -D_USE_MATH_DEFINES -I$(CORE_DIR) -DDISABLE_DEBUGGER -DDISABLE_TIMEKEEPING -Wno-multichar $(INCFLAGS)
-
-LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
-LOCAL_CFLAGS := $(COREFLAGS)
-LOCAL_CXXFLAGS := $(COREFLAGS) -std=c++11
+LOCAL_MODULE       := retro
+LOCAL_SRC_FILES    := $(SOURCES_CXX) $(SOURCES_C)
+LOCAL_CFLAGS       := $(COREFLAGS)
+LOCAL_CXXFLAGS     := $(COREFLAGS) -std=c++11
+LOCAL_LDFLAGS      := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
 LOCAL_CPP_FEATURES := exceptions rtti
-LOCAL_LDLIBS += -latomic
-
 include $(BUILD_SHARED_LIBRARY)
-