Android related fixes #2

Android.mk

@@ -8,10 +8,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := amiberry
 
-SDL_PATH := ../SDL
+SDL_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL
 #LIBMPEG2_PATH := ../mpeg2
-LIBPNG_PATH := ../SDL_image/external/libpng-1.6.37
-LIBXML_PATH := ../xml2
+LIBPNG_PATH := /home/midwan/projects/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
+LIBXML_PATH := /home/midwan/projects/amiberry-android/app/jni/xml2
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/osdep \
@@ -19,9 +19,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/include \
                     $(LOCAL_PATH)/src/archivers \
                     $(LOCAL_PATH)/guisan-dev/include \
-                    $(LOCAL_PATH)/$(SDL_PATH)/include \
-                    $(LOCAL_PATH)/$(LIBPNG_PATH) \
-                    $(LOCAL_PATH)/$(LIBXML_PATH)/include
+                    $(SDL_PATH)/include \
+                    $(LIBPNG_PATH) \
+                    $(LIBXML_PATH)/include
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
     LOCAL_ARM_NEON := true
@@ -33,7 +33,7 @@ endif
 LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers \
                     -Wno-shift-overflow -Wno-narrowing
 
-LOCAL_LDFLAGS +=
+LOCAL_LDFLAGS += -fuse-ld=gold
 
 # Add your application source files here...
 LOCAL_SRC_FILES := src/archivers/7z/BraIA64.c \
@@ -188,7 +188,7 @@ LOCAL_SRC_FILES := src/archivers/7z/BraIA64.c \
                     src/osdep/gui/PanelOnScreen.cpp
 
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-    LOCAL_SRC_FILES += src/osdep/aarch64_helper.s
+    LOCAL_SRC_FILES += src/osdep/aarch64_helper_min.s
 else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
     LOCAL_SRC_FILES += src/osdep/arm_helper.s
 endif