Commit 327536e7 authored by Thomas Guillem's avatar Thomas Guillem

LibVLC: remove private libs loading

Since these libs are not built anymore.
parent 27c8a645
......@@ -21,7 +21,6 @@
package org.videolan.libvlc;
import android.content.Context;
import android.os.Build;
import android.util.Log;
import org.videolan.libvlc.util.HWDecoderUtil;
......@@ -136,41 +135,6 @@ public class LibVLC extends VLCObject<LibVLC.Event> {
return;
sLoaded = true;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1
&& Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR1)
System.loadLibrary("anw.10");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR2)
System.loadLibrary("anw.13");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1)
System.loadLibrary("anw.14");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH)
System.loadLibrary("anw.18");
else
System.loadLibrary("anw.21");
} catch (Throwable t) {
Log.d(TAG, "anw library not loaded");
}
try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
System.loadLibrary("iomx.10");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR2)
System.loadLibrary("iomx.13");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1)
System.loadLibrary("iomx.14");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2)
System.loadLibrary("iomx.18");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT)
System.loadLibrary("iomx.19");
} catch (Throwable t) {
// No need to warn if it isn't found, when we intentionally don't build these except for debug
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
Log.w(TAG, "Unable to load the iomx library: " + t);
}
}
try {
System.loadLibrary("vlcjni");
System.loadLibrary("jniloader");
......
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