From e4e1a0f59b30eaa2463ba56f5bafdd17c880cc9c Mon Sep 17 00:00:00 2001
From: fysx <martin@fysx.org>
Date: Fri, 7 Feb 2014 23:40:02 +0100
Subject: [PATCH] properly use dynamic linking for LGPL libraries

---
 jni/Application.mk                 | 2 +-
 jni/devil-1.7.8/Android.mk         | 4 +++-
 jni/mpg123-1.17.0/Android.mk       | 2 +-
 jni/openal-soft-android/Android.mk | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index dae6fe48..2dc351f9 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -4,6 +4,6 @@
 APP_STL := gnustl_shared
 APP_ABI := armeabi armeabi-v7a
 APP_CPPFLAGS := -frtti
-APP_LDFLAGS := -llog -landroid -lz -lOpenSLES
+APP_LDFLAGS := -llog -landroid -lz
 
 # APP_OPTIM := debug
diff --git a/jni/devil-1.7.8/Android.mk b/jni/devil-1.7.8/Android.mk
index 2a66894a..7318a155 100644
--- a/jni/devil-1.7.8/Android.mk
+++ b/jni/devil-1.7.8/Android.mk
@@ -25,7 +25,9 @@ LOCAL_SRC_FILES := \
 	$(wildcard ${LOCAL_PATH}/src-IL/src/*.cpp) \
   $(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
 
+LOCAL_SHARED_LIBRARIES := libtiff libpng libjasper libjpeg libmng liblcms
+
 # $(info libdevil: include dirs $(LOCAL_C_INCLUDES))
 # $(info libdevil: src files $(LOCAL_SRC_FILES))
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/mpg123-1.17.0/Android.mk b/jni/mpg123-1.17.0/Android.mk
index 045388a1..d828686a 100644
--- a/jni/mpg123-1.17.0/Android.mk
+++ b/jni/mpg123-1.17.0/Android.mk
@@ -25,4 +25,4 @@ LOCAL_SRC_FILES := \
 # $(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
 # $(info libmpg123: src files $(LOCAL_SRC_FILES))
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/openal-soft-android/Android.mk b/jni/openal-soft-android/Android.mk
index 8ba0ce8d..9b2400a9 100644
--- a/jni/openal-soft-android/Android.mk
+++ b/jni/openal-soft-android/Android.mk
@@ -16,6 +16,7 @@ LOCAL_C_INCLUDES  :=  \
 LOCAL_SRC_FILES := \
 	$(filter-out \
 	 Alc/mixer_neon.c \
+	 Alc/mixer_inc.c \
 	 Alc/mixer_sse.c \
 	, $(subst $(LOCAL_PATH)/,,\
 		${LOCAL_PATH}/Alc/backends/base.c \
@@ -29,7 +30,6 @@ LOCAL_SRC_FILES := \
 		$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) \
 	))
 
-# $(info libopenal: include dirs $(LOCAL_C_INCLUDES))
-# $(info libopenal: src files $(LOCAL_SRC_FILES))
+LOCAL_LDLIBS := -lOpenSLES
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)