Commit 2ced0955 authored by Thomas Guillem's avatar Thomas Guillem Committed by Martin Storsjö

libiomx: Add disabled rules for building libiomx for jbmr2 and kitkat

This is useful for debugging.

Don't warn if unable to load these debug libs.
Signed-off-by: Martin Storsjö's avatarMartin Storsjö <martin@martin.st>
parent 3ed7e517
......@@ -10,6 +10,10 @@ JNI_SOURCES=$(SRC)/jni/*.c $(SRC)/jni/*.h
LIBVLC_LIBS = libvlcjni
LIBVLC_LIBS += libiomx-ics libiomx-hc libiomx-gingerbread
# The following iomx libs are used for DEBUG only.
# (after android Jelly Bean, we prefer to use MediaCodec instead of iomx)
#LIBVLC_LIBS += libiomx-kk libiomx-jbmr2
LIBVLCJNI= $(addprefix $(SRC)/obj/local/$(ARCH)/,$(addsuffix .so,$(LIBVLC_LIBS)))
LIBVLCJNI_H=$(SRC)/jni/libvlcjni.h
......
......@@ -114,6 +114,24 @@ LIBIOMX_INCLUDES_ics := $(LIBIOMX_INCLUDES_COMMON) \
LIBIOMX_LDLIBS_ics := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
LIBIOMX_CFLAGS_ics := $(LIBIOMX_CFLAGS_COMMON) -DANDROID_API=14
LIBIOMX_SRC_FILES_jbmr2 := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER)
LIBIOMX_INCLUDES_jbmr2 := $(LIBIOMX_INCLUDES_COMMON) \
$(ANDROID_SYS_HEADERS_JBMR2)/frameworks/native/include \
$(ANDROID_SYS_HEADERS_JBMR2)/frameworks/av/include \
$(ANDROID_SYS_HEADERS_JBMR2)/system/core/include \
$(ANDROID_SYS_HEADERS_JBMR2)/hardware/libhardware/include
LIBIOMX_LDLIBS_jbmr2 := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
LIBIOMX_CFLAGS_jbmr2 := $(LIBIOMX_CFLAGS_COMMON) $(LIBIOMX_CFLAGS_HWBUFFER) -DANDROID_API=18
LIBIOMX_SRC_FILES_kk := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER)
LIBIOMX_INCLUDES_kk := $(LIBIOMX_INCLUDES_COMMON) \
$(ANDROID_SYS_HEADERS_KK)/frameworks/native/include \
$(ANDROID_SYS_HEADERS_KK)/frameworks/av/include \
$(ANDROID_SYS_HEADERS_KK)/system/core/include \
$(ANDROID_SYS_HEADERS_KK)/hardware/libhardware/include
LIBIOMX_LDLIBS_kk := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
LIBIOMX_CFLAGS_kk := $(LIBIOMX_CFLAGS_COMMON) $(LIBIOMX_CFLAGS_HWBUFFER) -DANDROID_API=19
define build_iomx
include $(CLEAR_VARS)
LOCAL_MODULE := $(1)
......
......@@ -102,7 +102,13 @@ public class LibVLC {
System.loadLibrary("iomx-hc");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1)
System.loadLibrary("iomx-ics");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2)
System.loadLibrary("iomx-jbmr2");
else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT)
System.loadLibrary("iomx-kk");
} 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 {
......
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