From 4aaf45d06b21382dac39e38881e3d13841746358 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sun, 15 May 2016 12:13:38 +0200 Subject: [PATCH] New Android NDK treats linker warnings as errors and fails on all projects using ASSIMP. Set LOCAL_DISABLE_FATAL_LINKER_WARNINGS to disable this behaviour. --- android/bloom/jni/Android.mk | 1 + android/computeparticles/jni/Android.mk | 1 + android/computeshader/jni/Android.mk | 1 + android/deferred/jni/Android.mk | 1 + android/displacement/jni/Android.mk | 1 + android/distancefieldfonts/jni/Android.mk | 1 + android/gears/jni/Android.mk | 1 + android/geometryshader/jni/Android.mk | 1 + android/instancing/jni/Android.mk | 1 + android/mesh/jni/Android.mk | 1 + android/multisampling/jni/Android.mk | 1 + android/multithreading/jni/Android.mk | 1 + android/occlusionquery/jni/Android.mk | 1 + android/offscreen/jni/Android.mk | 1 + android/parallaxmapping/jni/Android.mk | 1 + android/particlefire/jni/Android.mk | 1 + android/pipelines/jni/Android.mk | 1 + android/pushconstants/jni/Android.mk | 1 + android/radialblur/jni/Android.mk | 1 + android/raytracing/jni/Android.mk | 1 + android/shadowmapping/jni/Android.mk | 1 + android/shadowmappingomni/jni/Android.mk | 1 + android/skeletalanimation/jni/Android.mk | 1 + android/sphericalenvmapping/jni/Android.mk | 1 + android/tessellation/jni/Android.mk | 1 + android/textoverlay/jni/Android.mk | 1 + android/texture/jni/Android.mk | 1 + android/texturearray/jni/Android.mk | 1 + android/texturecubemap/jni/Android.mk | 1 + android/triangle/jni/Android.mk | 1 + android/vulkanscene/jni/Android.mk | 1 + 31 files changed, 31 insertions(+) diff --git a/android/bloom/jni/Android.mk b/android/bloom/jni/Android.mk index 23fb9073..db855f2f 100644 --- a/android/bloom/jni/Android.mk +++ b/android/bloom/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/computeparticles/jni/Android.mk b/android/computeparticles/jni/Android.mk index 2a1b42bb..711f29df 100644 --- a/android/computeparticles/jni/Android.mk +++ b/android/computeparticles/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/computeshader/jni/Android.mk b/android/computeshader/jni/Android.mk index e4e2533b..54832b18 100644 --- a/android/computeshader/jni/Android.mk +++ b/android/computeshader/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/deferred/jni/Android.mk b/android/deferred/jni/Android.mk index e7583d0b..1bdda12f 100644 --- a/android/deferred/jni/Android.mk +++ b/android/deferred/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/displacement/jni/Android.mk b/android/displacement/jni/Android.mk index a46b2005..2706c5e4 100644 --- a/android/displacement/jni/Android.mk +++ b/android/displacement/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/distancefieldfonts/jni/Android.mk b/android/distancefieldfonts/jni/Android.mk index aabab29c..dc68152f 100644 --- a/android/distancefieldfonts/jni/Android.mk +++ b/android/distancefieldfonts/jni/Android.mk @@ -39,6 +39,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/gears/jni/Android.mk b/android/gears/jni/Android.mk index c3591b3f..62107894 100644 --- a/android/gears/jni/Android.mk +++ b/android/gears/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/geometryshader/jni/Android.mk b/android/geometryshader/jni/Android.mk index f5449211..94a7d82b 100644 --- a/android/geometryshader/jni/Android.mk +++ b/android/geometryshader/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/instancing/jni/Android.mk b/android/instancing/jni/Android.mk index ead2b4fb..bce31727 100644 --- a/android/instancing/jni/Android.mk +++ b/android/instancing/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/mesh/jni/Android.mk b/android/mesh/jni/Android.mk index e81eaf04..7cc38be1 100644 --- a/android/mesh/jni/Android.mk +++ b/android/mesh/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/multisampling/jni/Android.mk b/android/multisampling/jni/Android.mk index f256e846..e80ab35e 100644 --- a/android/multisampling/jni/Android.mk +++ b/android/multisampling/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/multithreading/jni/Android.mk b/android/multithreading/jni/Android.mk index 6d11c6d0..8b2448ca 100644 --- a/android/multithreading/jni/Android.mk +++ b/android/multithreading/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/occlusionquery/jni/Android.mk b/android/occlusionquery/jni/Android.mk index f45ea520..5c0c67a6 100644 --- a/android/occlusionquery/jni/Android.mk +++ b/android/occlusionquery/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/offscreen/jni/Android.mk b/android/offscreen/jni/Android.mk index 2609bf2d..7d46b1f8 100644 --- a/android/offscreen/jni/Android.mk +++ b/android/offscreen/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/parallaxmapping/jni/Android.mk b/android/parallaxmapping/jni/Android.mk index 752e42cb..f84667ca 100644 --- a/android/parallaxmapping/jni/Android.mk +++ b/android/parallaxmapping/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/particlefire/jni/Android.mk b/android/particlefire/jni/Android.mk index 230eda1d..659a1742 100644 --- a/android/particlefire/jni/Android.mk +++ b/android/particlefire/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/pipelines/jni/Android.mk b/android/pipelines/jni/Android.mk index 84cf7019..287bed20 100644 --- a/android/pipelines/jni/Android.mk +++ b/android/pipelines/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/pushconstants/jni/Android.mk b/android/pushconstants/jni/Android.mk index 1f0867aa..d63f0779 100644 --- a/android/pushconstants/jni/Android.mk +++ b/android/pushconstants/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/radialblur/jni/Android.mk b/android/radialblur/jni/Android.mk index 98ea7bfc..02fd59ad 100644 --- a/android/radialblur/jni/Android.mk +++ b/android/radialblur/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/raytracing/jni/Android.mk b/android/raytracing/jni/Android.mk index 327b28ea..d0210afd 100644 --- a/android/raytracing/jni/Android.mk +++ b/android/raytracing/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/shadowmapping/jni/Android.mk b/android/shadowmapping/jni/Android.mk index d28de6f8..fff4674b 100644 --- a/android/shadowmapping/jni/Android.mk +++ b/android/shadowmapping/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/shadowmappingomni/jni/Android.mk b/android/shadowmappingomni/jni/Android.mk index fd0df8ea..9ab54801 100644 --- a/android/shadowmappingomni/jni/Android.mk +++ b/android/shadowmappingomni/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/skeletalanimation/jni/Android.mk b/android/skeletalanimation/jni/Android.mk index 923a1777..d2680787 100644 --- a/android/skeletalanimation/jni/Android.mk +++ b/android/skeletalanimation/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/sphericalenvmapping/jni/Android.mk b/android/sphericalenvmapping/jni/Android.mk index 381443f2..96a93b2b 100644 --- a/android/sphericalenvmapping/jni/Android.mk +++ b/android/sphericalenvmapping/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/tessellation/jni/Android.mk b/android/tessellation/jni/Android.mk index bfe5fda7..52f2c3fc 100644 --- a/android/tessellation/jni/Android.mk +++ b/android/tessellation/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/textoverlay/jni/Android.mk b/android/textoverlay/jni/Android.mk index 8ef0a8df..a8e0b2dc 100644 --- a/android/textoverlay/jni/Android.mk +++ b/android/textoverlay/jni/Android.mk @@ -38,6 +38,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/texture/jni/Android.mk b/android/texture/jni/Android.mk index 8cdb0249..b501491a 100644 --- a/android/texture/jni/Android.mk +++ b/android/texture/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/texturearray/jni/Android.mk b/android/texturearray/jni/Android.mk index b11b1de0..b71fc78c 100644 --- a/android/texturearray/jni/Android.mk +++ b/android/texturearray/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/texturecubemap/jni/Android.mk b/android/texturecubemap/jni/Android.mk index a4237f61..17313799 100644 --- a/android/texturecubemap/jni/Android.mk +++ b/android/texturecubemap/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/triangle/jni/Android.mk b/android/triangle/jni/Android.mk index 41579e2a..c86931af 100644 --- a/android/triangle/jni/Android.mk +++ b/android/triangle/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures diff --git a/android/vulkanscene/jni/Android.mk b/android/vulkanscene/jni/Android.mk index 6f4feab2..59667eca 100644 --- a/android/vulkanscene/jni/Android.mk +++ b/android/vulkanscene/jni/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures