Commit 428aa4f7 authored by Thomas Guillem's avatar Thomas Guillem

move LIBIOMX_LIBS and LIBIOMX_LIBS into compile-libvlc.sh

parent 401a423c
......@@ -600,6 +600,16 @@ VLC_SRC_DIR="$SRC_DIR/vlc"
ANDROID_SYS_HEADERS="$SRC_DIR/android-headers"
VLC_CONTRIB="$VLC_SRC_DIR/contrib/$TARGET_TUPLE"
if [ "${HAVE_64}" != 1 ];then
# Can't link with 32bits symbols.
# Not a problem since MediaCodec should work on 64bits devices (android-21)
LIBIOMX_LIBS="libiomx.14 libiomx.13 libiomx.10"
fi
# (after android Jelly Bean, we prefer to use MediaCodec instead of iomx)
#LIBIOMX_LIBS="${LIBIOMX_LIBS }libiomx.19 libiomx.18"
LIBANW_LIBS="libanw.10 libanw.13 libanw.14 libanw.18 libanw.21"
echo "Building NDK"
$ANDROID_NDK/ndk-build -C libvlc \
......@@ -611,6 +621,8 @@ $ANDROID_NDK/ndk-build -C libvlc \
TARGET_CFLAGS="$VLC_EXTRA_CFLAGS" \
EXTRA_LDFLAGS="$EXTRA_LDFLAGS" \
LIBVLC_LIBS="$LIBVLC_LIBS" \
LIBIOMX_LIBS="$LIBIOMX_LIBS" \
LIBANW_LIBS="$LIBANW_LIBS" \
APP_BUILD_SCRIPT=jni/Android.mk \
APP_PLATFORM=${ANDROID_API} \
APP_ABI=${ANDROID_ABI} \
......
......@@ -150,14 +150,6 @@ LIBIOMX_INCLUDES_21 := $(LIBIOMX_INCLUDES_COMMON) \
$(ANDROID_SYS_HEADERS)/21/system/core/include \
$(ANDROID_SYS_HEADERS)/21/hardware/libhardware/include
ifneq ($(HAVE_64),1)
# Can't link with 32bits symbols.
# Not a problem since MediaCodec should work on 64bits devices (android-21)
LIBIOMX_LIBS += libiomx.14 libiomx.13 libiomx.10
endif
# (after android Jelly Bean, we prefer to use MediaCodec instead of iomx)
#LIBIOMX_LIBS += libiomx.19 libiomx.18
define build_iomx
include $(CLEAR_VARS)
LOCAL_MODULE := $(1)
......@@ -190,7 +182,5 @@ $(TARGET_OUT)/$(1).so: $(ANDROID_PRIVATE_LIBS)
include $(BUILD_SHARED_LIBRARY)
endef
LIBANW_LIBS += libanw.10 libanw.13 libanw.14 libanw.18 libanw.21
$(foreach ANW_MODULE,$(LIBANW_LIBS), \
$(eval $(call build_anw,$(ANW_MODULE),$(subst libanw.,,$(ANW_MODULE)))))
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