Commit 09b56857 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove CXXSTL variable

parent e277ab93
...@@ -64,7 +64,6 @@ case "$REL" in ...@@ -64,7 +64,6 @@ case "$REL" in
GCCVER=4.8 GCCVER=4.8
ANDROID_API=android-9 ANDROID_API=android-9
fi fi
CXXSTL="/"${GCCVER}
;; ;;
*) *)
echo "You need the NDKv10 or later" echo "You need the NDKv10 or later"
...@@ -123,11 +122,11 @@ fi ...@@ -123,11 +122,11 @@ fi
EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2" EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include" EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/include"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include" EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/libs/${ANDROID_ABI}/include"
# Setup LDFLAGS # Setup LDFLAGS
EXTRA_LDFLAGS="-L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI} -lgnustl_static" EXTRA_LDFLAGS="-L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/libs/${ANDROID_ABI} -lgnustl_static"
LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined" LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
...@@ -139,8 +138,8 @@ if [ -n "$HAVE_ARM" ]; then ...@@ -139,8 +138,8 @@ if [ -n "$HAVE_ARM" ]; then
fi fi
fi fi
CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include" CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/libs/${ANDROID_ABI}/include"
LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}" LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${GCCVER}/libs/${ANDROID_ABI}"
SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/` ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
......
...@@ -99,7 +99,6 @@ case "$REL" in ...@@ -99,7 +99,6 @@ case "$REL" in
GCCVER=4.8 GCCVER=4.8
ANDROID_API=android-9 ANDROID_API=android-9
fi fi
CXXSTL="/"${GCCVER}
;; ;;
*) *)
echo "You need the NDKv10 or later" echo "You need the NDKv10 or later"
...@@ -108,7 +107,6 @@ case "$REL" in ...@@ -108,7 +107,6 @@ case "$REL" in
esac esac
export GCCVER export GCCVER
export CXXSTL
export ANDROID_API export ANDROID_API
# XXX : important! # XXX : important!
...@@ -215,7 +213,7 @@ export ANDROID_LIBS=${PWD}/android-libs ...@@ -215,7 +213,7 @@ export ANDROID_LIBS=${PWD}/android-libs
export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE} export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE}
make $CLEAN make $CLEAN
make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH CXXSTL=$CXXSTL RELEASE=$RELEASE $TARGET make -j1 TARGET_TUPLE=$TARGET_TUPLE PLATFORM_SHORT_ARCH=$PLATFORM_SHORT_ARCH GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
# #
# Exporting a environment script with all the necessary variables # Exporting a environment script with all the necessary variables
...@@ -248,7 +246,6 @@ export ANDROID_ABI=$ANDROID_ABI ...@@ -248,7 +246,6 @@ export ANDROID_ABI=$ANDROID_ABI
export ANDROID_SDK=$ANDROID_SDK export ANDROID_SDK=$ANDROID_SDK
export ANDROID_NDK=$ANDROID_NDK export ANDROID_NDK=$ANDROID_NDK
export GCCVER=$GCCVER export GCCVER=$GCCVER
export CXXSTL=$CXXSTL
export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
export ANDROID_LIBS=$ANDROID_LIBS export ANDROID_LIBS=$ANDROID_LIBS
export VLC_BUILD_DIR=$VLC_BUILD_DIR export VLC_BUILD_DIR=$VLC_BUILD_DIR
......
...@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include ...@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
ARCH=$(ANDROID_ABI) ARCH=$(ANDROID_ABI)
CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++$(CXXSTL)/libs/$(ARCH)/libgnustl_static.a CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(GCCVER)/libs/$(ARCH)/libgnustl_static.a
LOCAL_CFLAGS := -std=gnu99 LOCAL_CFLAGS := -std=gnu99
ifeq ($(ARCH), armeabi) ifeq ($(ARCH), armeabi)
......
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