[Android] add libanw for gingerbread
Thomas Guillem
git at videolan.org
Wed Nov 19 13:15:48 CET 2014
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov 19 10:56:50 2014 +0100| [d6c71a566159403fe9f949db8e646488ca2e7b09] | committer: Thomas Guillem
add libanw for gingerbread
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=d6c71a566159403fe9f949db8e646488ca2e7b09
---
Makefile | 2 +-
libvlc/src/org/videolan/libvlc/LibVLC.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c8de0b6..977b187 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
# (after android Jelly Bean, we prefer to use MediaCodec instead of iomx)
#LIBVLC_LIBS += libiomx.19 libiomx.18
-LIBVLC_LIBS += libanw.13 libanw.14 libanw.18
+LIBVLC_LIBS += libanw.10 libanw.13 libanw.14 libanw.18
LIBVLCJNI= $(addprefix $(SRC)/obj/local/$(ARCH)/,$(addsuffix .so,$(LIBVLC_LIBS)))
diff --git a/libvlc/src/org/videolan/libvlc/LibVLC.java b/libvlc/src/org/videolan/libvlc/LibVLC.java
index ce9a568..5dffb47 100644
--- a/libvlc/src/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/org/videolan/libvlc/LibVLC.java
@@ -115,9 +115,11 @@ public class LibVLC {
/* Load library before object instantiation */
static {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
try {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR2)
+ 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");
More information about the Android
mailing list