Remove GCCVER export

compile-libvlc.sh

@@ -484,6 +484,7 @@ $ANDROID_NDK/ndk-build -C libvlc \
     VLC_CONTRIB="$VLC_CONTRIB" \
     VLC_MODULES="$VLC_MODULES" \
     TARGET_CFLAGS="$VLC_EXTRA_CFLAGS" \
+    EXTRA_LDFLAGS="$EXTRA_LDFLAGS" \
     LIBVLC_LIBS="$LIBVLC_LIBS" \
     APP_BUILD_SCRIPT=jni/Android.mk \
     APP_PLATFORM=${ANDROID_API} \

compile.sh

@@ -91,7 +91,6 @@ case "$REL" in
     ;;
 esac
 
-export GCCVER            # Android.mk
 export ANDROID_API       # Android.mk for -21
 
 export TARGET_TUPLE      # Makefile for android-libs
@@ -168,7 +167,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 GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
+make -j1 TARGET_TUPLE=$TARGET_TUPLE RELEASE=$RELEASE $TARGET
 
 #
 # Exporting a environment script with all the necessary variables
@@ -200,7 +199,6 @@ export ANDROID_SDK=$ANDROID_SDK
 export ANDROID_NDK=$ANDROID_NDK
 export ANDROID_ABI=$ANDROID_ABI
 export ANDROID_API=$ANDROID_API
-export GCCVER=$GCCVER
 export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
 export ANDROID_LIBS=$ANDROID_LIBS
 export VLC_BUILD_DIR=$VLC_BUILD_DIR

libvlc/jni/Android.mk

@@ -51,8 +51,6 @@ LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
 
 ARCH=$(ANDROID_ABI)
 
-CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(GCCVER)/libs/$(ARCH)/libgnustl_static.a
-
 LOCAL_CFLAGS := -std=gnu99
 ifeq ($(ARCH), armeabi)
 	LOCAL_CFLAGS += -DHAVE_ARMEABI
@@ -86,7 +84,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-ldsm -ltasn1 \
 	-lmad \
 	-lzvbi \
-	$(CPP_STATIC)
+	$(EXTRA_LDFLAGS)
 
 ################
 # PRIVATE LIBS #