Commit 88211acc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove SYSROOT export

parent 4d7c8efd
......@@ -30,11 +30,6 @@ if [ -z "$ANDROID_ABI" ]; then
exit 1
fi
if [ -z "$SYSROOT" ]; then
echo "Please set the right SYSROOT"
exit 1
fi
RELEASE=0
for i in ${@}; do
case "$i" in
......@@ -93,6 +88,8 @@ else
HAVE_ARM=1
fi
SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
###############
# DISPLAY ABI #
###############
......@@ -491,4 +488,5 @@ $ANDROID_NDK/ndk-build -C libvlc \
APP_BUILD_SCRIPT=jni/Android.mk \
APP_PLATFORM=${ANDROID_API} \
APP_ABI=${ANDROID_ABI} \
SYSROOT=${SYSROOT} \
NDK_PROJECT_PATH=jni
......@@ -94,8 +94,6 @@ esac
export GCCVER # Android.mk
export ANDROID_API # Android.mk for -21
SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
export SYSROOT # Makefile for android-libs
export TARGET_TUPLE # Makefile for android-libs
export HAVE_64 # Makefile for libiomx.so.*
......@@ -170,7 +168,7 @@ export ANDROID_SYS_HEADERS=${PWD}/android-headers # Android.mk
export ANDROID_LIBS=${PWD}/android-libs # Android.mk
export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE} # Android.mk
make -j1 TARGET_TUPLE=$TARGET_TUPLE SYSROOT=$SYSROOT GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
make -j1 TARGET_TUPLE=$TARGET_TUPLE GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
#
# Exporting a environment script with all the necessary variables
......@@ -203,7 +201,6 @@ export ANDROID_NDK=$ANDROID_NDK
export ANDROID_ABI=$ANDROID_ABI
export ANDROID_API=$ANDROID_API
export GCCVER=$GCCVER
export SYSROOT=$SYSROOT
export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
export ANDROID_LIBS=$ANDROID_LIBS
export VLC_BUILD_DIR=$VLC_BUILD_DIR
......
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