[Android] Remove CXXSTL variable
Jean-Baptiste Kempf
git at videolan.org
Wed Feb 4 19:01:24 CET 2015
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 4 19:01:13 2015 +0100| [09b56857095c7afa3f0cc36eb14eee1b8dd643c3] | committer: Jean-Baptiste Kempf
Remove CXXSTL variable
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=09b56857095c7afa3f0cc36eb14eee1b8dd643c3
---
compile-libvlc.sh | 11 +++++------
compile.sh | 5 +----
libvlc/jni/Android.mk | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 3ba2a7e..75870ec 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -64,7 +64,6 @@ case "$REL" in
GCCVER=4.8
ANDROID_API=android-9
fi
- CXXSTL="/"${GCCVER}
;;
*)
echo "You need the NDKv10 or later"
@@ -123,11 +122,11 @@ fi
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++${CXXSTL}/libs/${ANDROID_ABI}/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++/${GCCVER}/libs/${ANDROID_ABI}/include"
# 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"
@@ -139,8 +138,8 @@ if [ -n "$HAVE_ARM" ]; then
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"
-LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}"
+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++/${GCCVER}/libs/${ANDROID_ABI}"
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/`
diff --git a/compile.sh b/compile.sh
index a47a1f4..8c99423 100755
--- a/compile.sh
+++ b/compile.sh
@@ -99,7 +99,6 @@ case "$REL" in
GCCVER=4.8
ANDROID_API=android-9
fi
- CXXSTL="/"${GCCVER}
;;
*)
echo "You need the NDKv10 or later"
@@ -108,7 +107,6 @@ case "$REL" in
esac
export GCCVER
-export CXXSTL
export ANDROID_API
# XXX : important!
@@ -215,7 +213,7 @@ export ANDROID_LIBS=${PWD}/android-libs
export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE}
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
@@ -248,7 +246,6 @@ export ANDROID_ABI=$ANDROID_ABI
export ANDROID_SDK=$ANDROID_SDK
export ANDROID_NDK=$ANDROID_NDK
export GCCVER=$GCCVER
-export CXXSTL=$CXXSTL
export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
export ANDROID_LIBS=$ANDROID_LIBS
export VLC_BUILD_DIR=$VLC_BUILD_DIR
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index fd9a17f..24ac0e7 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
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
ifeq ($(ARCH), armeabi)
More information about the Android
mailing list