Merge pull request #92 from webgeek1234/master

Refactor android jni makefiles

Author: inactive123

libretro/jni/Android.mk

@@ -1,44 +1,25 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
-ifneq ($(GIT_VERSION)," unknown")
-	LOCAL_CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-endif
+CORE_DIR     := $(LOCAL_PATH)/../..
+LIBRETRO_DIR := $(CORE_DIR)/libretro
 
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM
-LOCAL_ARM_MODE := arm
-endif
+SOURCES_ASM :=
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS +=  -DANDROID_X86
-endif
+FRONTEND_SUPPORTS_RGB565 := 1
+TILED_RENDERING          := 1
 
-ifeq ($(TARGET_ARCH),mips)
-LOCAL_CFLAGS += -DANDROID_MIPS
-endif
+include $(CORE_DIR)/build/Makefile.common
 
-CORE_DIR      := ../..
-LIBRETRO_DIR := ../
+COREFLAGS := -DHAVE_STDINT_H -DFRONTEND_SUPPORTS_RGB565 $(COREDEFINES) $(INCFLAGS)
 
-include ../../build/Makefile.common
-
-LOCAL_MODULE    := libretro
-LOCAL_SRC_FILES = $(SOURCES_CXX) $(SOURCES_C)
-LOCAL_CFLAGS = -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DSPEEDHAX -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DTILED_RENDERING $(INCFLAGS)
-LOCAL_C_INCLUDES = ../src
-
-# https://code.google.com/p/android-ndk-profiler/
-# Example: ndk-build NDK_MODULE_PATH=.../android-ndk-profiler-prebuilt-3.3 APP_ABI=armeabi-v7a PROFILE=1
-ifeq ($(PROFILE), 1)
-LOCAL_CFLAGS += -pg -DPROFILE -DPROFILE_ANDROID
-LOCAL_STATIC_LIBRARIES := android-ndk-profiler
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
+include $(CLEAR_VARS)
+LOCAL_MODULE    := retro
+LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C) $(SOURCES_ASM)
+LOCAL_CFLAGS    := $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
 include $(BUILD_SHARED_LIBRARY)
-
-ifeq ($(PROFILE), 1)
-$(call import-module,android-ndk-profiler)
-endif