[Android] LibVLC: don't try to load private libs after Android M

Thomas Guillem git at videolan.org
Wed Oct 26 14:59:32 CEST 2016


vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Oct 26 14:58:53 2016 +0200| [c39f7c3b8d26622604e9e878190d95dccc6c7492] | committer: Thomas Guillem

LibVLC: don't try to load private libs after Android M

Since it's not allowed anymore.

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

 libvlc/src/org/videolan/libvlc/LibVLC.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libvlc/src/org/videolan/libvlc/LibVLC.java b/libvlc/src/org/videolan/libvlc/LibVLC.java
index 8fc8882..04f2292 100644
--- a/libvlc/src/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/org/videolan/libvlc/LibVLC.java
@@ -138,7 +138,8 @@ public class LibVLC extends VLCObject<LibVLC.Event> {
         sLoaded = true;
 
         System.loadLibrary("c++_shared");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
+        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");



More information about the Android mailing list