[Android] build: add anw.21

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Dec  3 10:44:19 2014 +0100| [65141ec0abe57201b7c7f104b8fd0188b4f5befc] | committer: Thomas Guillem

build: add anw.21

In order to fix nativewindowpriv for 64bits (there are some #if __LP64__ in
headers).

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=65141ec0abe57201b7c7f104b8fd0188b4f5befc
---

 Makefile                                   |    2 +-
 libvlc/jni/Android.mk                      |    6 ++++++
 libvlc/src/org/videolan/libvlc/LibVLC.java |    4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 977b187..2feae53 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.10 libanw.13 libanw.14 libanw.18
+LIBVLC_LIBS += libanw.10 libanw.13 libanw.14 libanw.18 libanw.21
 
 LIBVLCJNI= $(addprefix $(SRC)/obj/local/$(ARCH)/,$(addsuffix .so,$(LIBVLC_LIBS)))
 
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index 9602ab4..5a868fb 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -117,6 +117,12 @@ LIBIOMX_INCLUDES_19 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS)/19/system/core/include \
 	$(ANDROID_SYS_HEADERS)/19/hardware/libhardware/include
 
+LIBIOMX_INCLUDES_21 := $(LIBIOMX_INCLUDES_COMMON) \
+	$(ANDROID_SYS_HEADERS)/21/frameworks/native/include \
+	$(ANDROID_SYS_HEADERS)/21/frameworks/av/include \
+	$(ANDROID_SYS_HEADERS)/21/system/core/include \
+	$(ANDROID_SYS_HEADERS)/21/hardware/libhardware/include
+
 define build_iomx
 include $(CLEAR_VARS)
 LOCAL_MODULE := $(1)
diff --git a/libvlc/src/org/videolan/libvlc/LibVLC.java b/libvlc/src/org/videolan/libvlc/LibVLC.java
index 5d1f830..8bac400 100644
--- a/libvlc/src/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/org/videolan/libvlc/LibVLC.java
@@ -123,8 +123,10 @@ public class LibVLC {
                     System.loadLibrary("anw.13");
                 else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1)
                     System.loadLibrary("anw.14");
-                else
+                else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH)
                     System.loadLibrary("anw.18");
+                else
+                    System.loadLibrary("anw.21");
             } catch (Throwable t) {
                 Log.w(TAG, "Unable to load the anw library: " + t);
             }