Commit 60db4310 authored by Thomas Guillem's avatar Thomas Guillem

fix build with last vlc-android changes

 - No more c++_shared
 - No libvlc.so
 - add jniloader.so
parent 52017ae0
......@@ -28,7 +28,7 @@ LIBVLC_LIBS=`realpath "${rootdir}"/vlc-android/libvlc/jni/libs`
for project in native_sample;do
for arch in `ls ${LIBVLC_LIBS}`;do
if [ ! -f "${LIBVLC_LIBS}/${arch}/libvlc.so" ];then
if [ ! -f "${LIBVLC_LIBS}/${arch}/libvlcjni.so" ];then
continue
fi
......
......@@ -5,7 +5,7 @@ LOCAL_MODULE := native
LOCAL_SRC_FILES := main.c
LOCAL_LDLIBS := -L${LIBVLC_LIBS} -llog -lvlc
LOCAL_LDLIBS := -L${LIBVLC_LIBS} -llog -lvlcjni
LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
......
......@@ -42,7 +42,6 @@ public class NativeActivity extends AppCompatActivity implements IVLCVout.Callba
if (sInit != -1)
return sInit == 1;
System.loadLibrary("c++_shared");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR1)
......@@ -61,7 +60,8 @@ public class NativeActivity extends AppCompatActivity implements IVLCVout.Callba
}
try {
System.loadLibrary("vlc");
System.loadLibrary("vlcjni");
System.loadLibrary("jniloader");
System.loadLibrary("native");
} catch (UnsatisfiedLinkError ule) {
Toast.makeText(context, "Can't load vlcjni library: " + ule, Toast.LENGTH_LONG).show();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment