From 16ef1f008cd4bc6d566df4ad7f978c3cb2559df5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 11 Jun 2014 12:37:58 +0200 Subject: [PATCH] (Android) Remove obsolete android/native - compile always from android/phoenix/jni now --- android/native/.classpath | 8 ---- android/native/.project | 33 --------------- android/native/jni/Android.mk | 61 --------------------------- android/native/res/values/strings.xml | 4 -- android/phoenix/jni/Android.mk | 60 +++++++++++++++++++++++++- 5 files changed, 58 insertions(+), 108 deletions(-) delete mode 100644 android/native/.classpath delete mode 100644 android/native/.project delete mode 100644 android/native/jni/Android.mk delete mode 100644 android/native/res/values/strings.xml diff --git a/android/native/.classpath b/android/native/.classpath deleted file mode 100644 index 3f9691c5dd..0000000000 --- a/android/native/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/android/native/.project b/android/native/.project deleted file mode 100644 index eea71ff970..0000000000 --- a/android/native/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - android.app.NativeActivity - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk deleted file mode 100644 index cac0b7798a..0000000000 --- a/android/native/jni/Android.mk +++ /dev/null @@ -1,61 +0,0 @@ -LOCAL_PATH := $(call my-dir) -HAVE_NEON := 1 -HAVE_LOGGER := 1 - -include $(CLEAR_VARS) -ifeq ($(TARGET_ARCH),arm) - LOCAL_CFLAGS += -DANDROID_ARM -marm - LOCAL_ARM_MODE := arm -endif - -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3 -endif - -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - -ifeq ($(HAVE_NEON),1) - LOCAL_CFLAGS += -DHAVE_NEON - LOCAL_SRC_FILES += ../../../audio/utils_neon.S.neon -endif - -ifeq ($(HAVE_NEON),1) - LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon -endif -LOCAL_CFLAGS += -DSINC_LOWER_QUALITY - -LOCAL_CFLAGS += -DANDROID_ARM_V7 -endif - -ifeq ($(TARGET_ARCH),mips) - LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ -endif - -LOCAL_MODULE := retroarch-activity - -RARCH_PATH := ../../.. -LOCAL_SRC_FILES += $(RARCH_PATH)/griffin/griffin.c - -ifeq ($(HAVE_LOGGER), 1) - LOCAL_CFLAGS += -DHAVE_LOGGER - LOGGER_LDLIBS := -llog -endif - -ifeq ($(GLES),3) - GLES_LIB := -lGLESv3 - LOCAL_CFLAGS += -DHAVE_OPENGLES3 -else - GLES_LIB := -lGLESv2 -endif - -LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -I../../../deps/miniz -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA -DRARCH_INTERNAL -DHAVE_LOCATION -DHAVE_CC_RESAMPLER -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG - -LOCAL_CFLAGS += -O2 - -LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl - -LOCAL_CFLAGS += -DHAVE_SL -LOCAL_LDLIBS += -lOpenSLES -lz - -include $(BUILD_SHARED_LIBRARY) - diff --git a/android/native/res/values/strings.xml b/android/native/res/values/strings.xml deleted file mode 100644 index d8f551374e..0000000000 --- a/android/native/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - NativeActivity - diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index 9597780976..04431504d8 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -1,7 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_ARM_MODE := arm LOCAL_MODULE := retroarch-jni RARCH_DIR := ../../.. LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -I$(LOCAL_PATH)/$(RARCH_DIR) @@ -10,5 +9,62 @@ LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/file_extract.c $(RARCH include $(BUILD_SHARED_LIBRARY) -include $(LOCAL_PATH)/../../native/jni/Android.mk +HAVE_NEON := 1 +HAVE_LOGGER := 1 + +include $(CLEAR_VARS) +ifeq ($(TARGET_ARCH),arm) + LOCAL_CFLAGS += -DANDROID_ARM -marm + LOCAL_ARM_MODE := arm +endif + +ifeq ($(TARGET_ARCH),x86) + LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3 +endif + +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + +ifeq ($(HAVE_NEON),1) + LOCAL_CFLAGS += -DHAVE_NEON + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/utils_neon.S.neon +endif + +ifeq ($(HAVE_NEON),1) + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/sinc_neon.S.neon +endif +LOCAL_CFLAGS += -DSINC_LOWER_QUALITY + +LOCAL_CFLAGS += -DANDROID_ARM_V7 +endif + +ifeq ($(TARGET_ARCH),mips) + LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ +endif + +LOCAL_MODULE := retroarch-activity + +LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin.c + +ifeq ($(HAVE_LOGGER), 1) + LOCAL_CFLAGS += -DHAVE_LOGGER + LOGGER_LDLIBS := -llog +endif + +ifeq ($(GLES),3) + GLES_LIB := -lGLESv3 + LOCAL_CFLAGS += -DHAVE_OPENGLES3 +else + GLES_LIB := -lGLESv2 +endif + +LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA -DRARCH_INTERNAL -DHAVE_LOCATION -DHAVE_CC_RESAMPLER -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG + +LOCAL_CFLAGS += -O2 + +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl + +LOCAL_CFLAGS += -DHAVE_SL +LOCAL_LDLIBS += -lOpenSLES -lz + +include $(BUILD_SHARED_LIBRARY)