Commit 1a76d342 authored by Martin Storsjö's avatar Martin Storsjö

Build and load the iomx glue code as a separate shared library

Signed-off-by: Martin Storsjö's avatarMartin Storsjö <martin@martin.st>
parent 08fd4f2d
......@@ -22,7 +22,16 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-lavformat -lavcodec -lswscale -lavutil -lpostproc \
-lmpeg2 -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 \
-lebml -lmatroska -ltag \
-L$(ANDROID_LIBS) -lgcc -lstagefright -lmedia -lutils -lbinder \
$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libstdc++.a
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libiomx
LOCAL_SRC_FILES := ../$(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp
LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/modules/codec/omxil $(ANDROID_SYS_HEADERS)/frameworks/base/include $(ANDROID_SYS_HEADERS)/system/core/include
LOCAL_LDLIBS := -L$(ANDROID_LIBS) -lgcc -lstagefright -lmedia -lutils -lbinder
include $(BUILD_SHARED_LIBRARY)
......@@ -29,6 +29,11 @@ public class LibVLC {
/* Load library before object instantiation */
static {
try {
System.loadLibrary("iomx");
} catch (Throwable t) {
Log.w(TAG, "Unable to load the iomx library: " + t);
}
try {
System.loadLibrary("vlcjni");
} catch (UnsatisfiedLinkError ule) {
......
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