Merge branch 'mainline' into libretro

[pcsx_rearmed.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 72c6738..36b0c93 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,6 +4,9 @@ include $(CLEAR_VARS)
 
 APP_DIR := ../../src
 
+#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
    NO_NEON_BUILD := 1
 else