Fix up android jni makefiles

Clean up and fix errors with newer ndk versions
This commit is contained in:
Aaron Kling 2018-03-31 15:03:16 -05:00
parent 638aad3ad5
commit 4b0914b103
2 changed files with 26 additions and 29 deletions

View File

@ -1,48 +1,44 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
CORE_CFLAGS :=
CORE_LDLIBS :=
CPU_ARCH :=
HAVE_DYNAREC :=
SOURCES_C :=
SOURCES_ASM :=
CORE_DIR := ..
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
CORE_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
LOCAL_MODULE := retro
CPU_ARCH :=
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH -DARM_MEMORY_DYNAREC
LOCAL_ARM_MODE := arm
CPU_ARCH := arm
HAVE_DYNAREC := 1
CORE_CFLAGS += -DARM_ARCH -DARM_MEMORY_DYNAREC
CPU_ARCH := arm
HAVE_DYNAREC := 1
endif
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_MMAP
CPU_ARCH := x86_32
HAVE_DYNAREC := 1
CORE_CFLAGS += -DHAVE_MMAP
CPU_ARCH := x86_32
HAVE_DYNAREC := 1
endif
#ifeq ($(TARGET_ARCH),mips)
#LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
#endif
CORE_DIR := ..
SOURCES_C :=
SOURCES_ASM :=
ifeq ($(HAVE_DYNAREC),1)
LOCAL_CFLAGS += -DHAVE_DYNAREC
endif
ifeq ($(CPU_ARCH),arm)
LOCAL_CFLAGS += -DARM_ARCH
CORE_CFLAGS += -DHAVE_DYNAREC
CORE_LDLIBS += -Wl,--no-warn-shared-textrel
endif
include $(CORE_DIR)/Makefile.common
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
LOCAL_CFLAGS += -O2 -DNDEBUG -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
CORE_CFLAGS += -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
include $(CLEAR_VARS)
LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
LOCAL_CFLAGS := $(CORE_CFLAGS)
LOCAL_LDLIBS := $(CORE_LDLIBS)
LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY)

View File

@ -1 +1,2 @@
APP_ABI := armeabi armeabi-v7a x86
NDK_TOOLCHAIN_VERSION := 4.9
APP_ABI := armeabi armeabi-v7a arm64-v8a x86