[Android] Android.mk: make sure contrib-lib has precedence when linking

Filip Roséen git at videolan.org
Fri Apr 14 01:02:34 CEST 2017


vlc-android | branch: master | Filip Roséen <filip at atch.se> | Fri Apr 14 00:49:55 2017 +0200| [464849cd026797c7fcb5d636b56042c7ba490767] | committer: Jean-Baptiste Kempf

Android.mk: make sure contrib-lib has precedence when linking

The contents of LOCAL_LDLIBS are added after the default linker-flags,
whereas LOCAL_LDFLAGS are added before, meaning that we previously
would link with the NDK libraries, even if libraries from contrib are
wanted.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> https://code.videolan.org/videolan/vlc-android/commit/464849cd026797c7fcb5d636b56042c7ba490767
---

 libvlc/jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index 538b225..cff9a87 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -4,8 +4,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libvlc
 ARCH=$(APP_ABI)
 LOCAL_SRC_FILES += libvlcjni-modules.c libvlcjni-symbols.c dummy.cpp
+LOCAL_LDFLAGS := -L$(VLC_CONTRIB)/lib
 LOCAL_LDLIBS := \
-	-L$(VLC_CONTRIB)/lib \
 	$(VLC_MODULES) \
 	$(VLC_BUILD_DIR)/lib/.libs/libvlc.a \
 	$(VLC_BUILD_DIR)/src/.libs/libvlccore.a \



More information about the Android mailing list