aboutsummaryrefslogtreecommitdiff
path: root/jni/Android.mk
diff options
context:
space:
mode:
authoralexis-puska2016-07-31 15:05:09 +0200
committeralexis-puska2016-07-31 15:05:09 +0200
commit127622a0091a7a54c8c32069bdd262ad6d402b16 (patch)
tree4a50bbbbfa0a22897fc64c850af54e604c30a6da /jni/Android.mk
parent2ca181a92610030e29f146c876c55fd5a5f46ba9 (diff)
parent3e2464bab1577295b8f4eee9756dbaf22a03ea67 (diff)
downloadpcsx_rearmed-127622a0091a7a54c8c32069bdd262ad6d402b16.tar.gz
pcsx_rearmed-127622a0091a7a54c8c32069bdd262ad6d402b16.tar.bz2
pcsx_rearmed-127622a0091a7a54c8c32069bdd262ad6d402b16.zip
Merge remote-tracking branch 'libretro/master'
Diffstat (limited to 'jni/Android.mk')
-rw-r--r--jni/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 72c6738..36b0c93 100644
--- 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