Commit 8e4a46f5 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Use a complete path for VLC_SRC_DIR

parent 2382e705
...@@ -89,6 +89,7 @@ else ...@@ -89,6 +89,7 @@ else
fi fi
SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
SRC_DIR=$PWD
############### ###############
# DISPLAY ABI # # DISPLAY ABI #
...@@ -441,7 +442,7 @@ echo "Building" ...@@ -441,7 +442,7 @@ echo "Building"
make $MAKEFLAGS make $MAKEFLAGS
checkfail "vlc: make failed" checkfail "vlc: make failed"
cd ../.. cd $SRC_DIR
###################################################################################### ######################################################################################
...@@ -471,8 +472,8 @@ printf "/* Autogenerated from the list of modules */\n $DEFINITION\n $BUILTINS\n ...@@ -471,8 +472,8 @@ printf "/* Autogenerated from the list of modules */\n $DEFINITION\n $BUILTINS\n
echo $VLC_BUILD_DIR echo $VLC_BUILD_DIR
LIBVLC_LIBS="libvlcjni" LIBVLC_LIBS="libvlcjni"
VLC_MODULES=`echo $VLC_MODULES|sed "s|vlc/$VLC_BUILD_DIR|../vlc/$VLC_BUILD_DIR|g"` VLC_MODULES=`echo $VLC_MODULES|sed "s|vlc/$VLC_BUILD_DIR|../vlc/$VLC_BUILD_DIR|g"`
VLC_SRC_DIR="../vlc" VLC_SRC_DIR="$SRC_DIR/vlc"
ANDROID_SYS_HEADERS="../android-headers" ANDROID_SYS_HEADERS="$SRC_DIR/android-headers"
VLC_CONTRIB="$VLC_SRC_DIR/contrib/$TARGET_TUPLE" VLC_CONTRIB="$VLC_SRC_DIR/contrib/$TARGET_TUPLE"
echo "Building NDK" echo "Building NDK"
...@@ -490,4 +491,4 @@ $ANDROID_NDK/ndk-build -C libvlc \ ...@@ -490,4 +491,4 @@ $ANDROID_NDK/ndk-build -C libvlc \
APP_PLATFORM=${ANDROID_API} \ APP_PLATFORM=${ANDROID_API} \
APP_ABI=${ANDROID_ABI} \ APP_ABI=${ANDROID_ABI} \
SYSROOT=${SYSROOT} \ SYSROOT=${SYSROOT} \
NDK_PROJECT_PATH=jni NDK_PROJECT_PATH=jni V=1
...@@ -61,7 +61,7 @@ endif ...@@ -61,7 +61,7 @@ endif
ifeq ($(ARCH), armeabi-v7a) ifeq ($(ARCH), armeabi-v7a)
LOCAL_CFLAGS += -DHAVE_ARMEABI_V7A LOCAL_CFLAGS += -DHAVE_ARMEABI_V7A
endif endif
ifneq (,$(wildcard $(LOCAL_PATH)/../$(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c)) ifneq (,$(wildcard $(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c))
LOCAL_CFLAGS += -DHAVE_IOMX_DR LOCAL_CFLAGS += -DHAVE_IOMX_DR
endif endif
LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
...@@ -155,7 +155,7 @@ endif ...@@ -155,7 +155,7 @@ endif
define build_iomx define build_iomx
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := $(1) LOCAL_MODULE := $(1)
LOCAL_SRC_FILES := ../$(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp LOCAL_SRC_FILES := $(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp
LOCAL_C_INCLUDES := $(LIBIOMX_INCLUDES_$(2)) LOCAL_C_INCLUDES := $(LIBIOMX_INCLUDES_$(2))
LOCAL_LDLIBS := -L$(ANDROID_PRIVATE_LIBDIR) -lgcc -lstagefright -lmedia -lutils -lbinder -llog -lcutils -lui LOCAL_LDLIBS := -L$(ANDROID_PRIVATE_LIBDIR) -lgcc -lstagefright -lmedia -lutils -lbinder -llog -lcutils -lui
LOCAL_CFLAGS := -Wno-psabi -DAPP_PLATFORM=$(2) LOCAL_CFLAGS := -Wno-psabi -DAPP_PLATFORM=$(2)
...@@ -171,7 +171,7 @@ $(foreach IOMX_MODULE, $(LIBIOMX_LIBS), \ ...@@ -171,7 +171,7 @@ $(foreach IOMX_MODULE, $(LIBIOMX_LIBS), \
####### #######
# ANW # # ANW #
####### #######
LIBANW_SRC_FILES_COMMON += ../$(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c LIBANW_SRC_FILES_COMMON += $(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c
# Once we always build this with a version of vlc that contains nativewindowpriv.c, # Once we always build this with a version of vlc that contains nativewindowpriv.c,
# we can remove this condition # we can remove this condition
ifneq (,$(wildcard $(LOCAL_PATH)/$(LIBANW_SRC_FILES_COMMON))) ifneq (,$(wildcard $(LOCAL_PATH)/$(LIBANW_SRC_FILES_COMMON)))
......
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