[Android] compile.sh: merge medialibrary ldlibs

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec 22 10:34:39 2016 +0100| [28fe2cf0375564c4583958edee39aad79e64b602] | committer: Thomas Guillem

compile.sh: merge medialibrary ldlibs

> https://code.videolan.org/videolan/vlc-android/commit/28fe2cf0375564c4583958edee39aad79e64b602
---

 compile-libvlc.sh           | 13 +++++++------
 medialibrary/jni/Android.mk |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 9b3c7ee..3d816b1 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -855,6 +855,11 @@ cd ${SRC_DIR}
 
 echo -e "ndk-build medialibrary"
 
+MEDIALIBRARY_LDLIBS="-L$SRC_DIR/libvlc/jni/libs/$ANDROID_ABI -lvlc \
+-L${MEDIALIBRARY_BUILD_DIR}/build-android-$ANDROID_ABI/.libs -lmedialibrary \
+-L$SRC_DIR/vlc/contrib/contrib-android-$TARGET_TUPLE/jpeg/.libs -ljpeg \
+-L$MEDIALIBRARY_MODULE_DIR/$SQLITE_RELEASE/build-$ANDROID_ABI/.libs -lsqlite3"
+
 $ANDROID_NDK/ndk-build -C medialibrary \
     APP_STL="c++_shared" \
     ANDROID_SYS_HEADERS="$ANDROID_SYS_HEADERS" \
@@ -866,12 +871,8 @@ $ANDROID_NDK/ndk-build -C medialibrary \
     NDK_PROJECT_PATH=jni \
     NDK_TOOLCHAIN_VERSION=clang \
     NDK_DEBUG=${NDK_DEBUG} \
-    VLC_LIBS="-L$SRC_DIR/libvlc/jni/libs/$ANDROID_ABI -lvlc" \
-    MEDIALIBRARY_LIBS="-L${MEDIALIBRARY_BUILD_DIR}/build-android-$ANDROID_ABI/.libs -lmedialibrary" \
-    LIBJPEG_LIBS="-L$SRC_DIR/vlc/contrib/contrib-android-$TARGET_TUPLE/jpeg/.libs -ljpeg" \
-    SQLITE_LIBS="-L$MEDIALIBRARY_MODULE_DIR/$SQLITE_RELEASE/build-$ANDROID_ABI/.libs -lsqlite3" \
-    MEDIALIBRARY_INCLUDE_DIR=${MEDIALIBRARY_BUILD_DIR}/include \
-    SQLITE3_DIR=${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}/build-$ANDROID_ABI/.libs
+    MEDIALIBRARY_LDLIBS="${MEDIALIBRARY_LDLIBS}" \
+    MEDIALIBRARY_INCLUDE_DIR=${MEDIALIBRARY_BUILD_DIR}/include
 
 checkfail "ndk-build failed"
 
diff --git a/medialibrary/jni/Android.mk b/medialibrary/jni/Android.mk
index 59d6885..11397c5 100644
--- a/medialibrary/jni/Android.mk
+++ b/medialibrary/jni/Android.mk
@@ -2,6 +2,6 @@ LOCAL_PATH := $(call my-dir)
 LOCAL_SRC_FILES := medialibrary.cpp AndroidMediaLibrary.cpp AndroidDeviceLister.cpp utils.cpp
 LOCAL_MODULE    := mla
 LOCAL_MODULE_FILENAME := libmla
-LOCAL_LDLIBS    += $(MEDIALIBRARY_LIBS) $(VLC_LIBS) $(LIBJPEG_LIBS) $(SQLITE_LIBS) -llog
+LOCAL_LDLIBS    := $(MEDIALIBRARY_LDLIBS) -llog
 LOCAL_C_INCLUDES := $(MEDIALIBRARY_INCLUDE_DIR)
 include $(BUILD_SHARED_LIBRARY)