[Android] remove ANDROID_BIN (duplicate with NDK_TOOLCHAIN_PATH})
Thomas Guillem
git at videolan.org
Mon Feb 9 15:03:03 CET 2015
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Feb 9 14:17:05 2015 +0100| [34aa3eb80440bd2afb08e9d1de16dd6b24312ed6] | committer: Thomas Guillem
remove ANDROID_BIN (duplicate with NDK_TOOLCHAIN_PATH})
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=34aa3eb80440bd2afb08e9d1de16dd6b24312ed6
---
compile-libvlc.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 1902fd8..84bd3e3 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -126,6 +126,7 @@ SRC_DIR=$PWD
# Add the NDK toolchain to the PATH, needed both for contribs and for building
# stub libraries
NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin`
+CROSS_COMPILE=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
###############
@@ -224,11 +225,6 @@ fi
echo "CFLAGS: ${CFLAGS}"
echo "EXTRA_CFLAGS: ${EXTRA_CFLAGS}"
-
-ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
-export PATH=$ANDROID_BIN:$PATH
-################################################################################
-
cd vlc
###########################
@@ -345,8 +341,6 @@ mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
# CONFIGURE #
#############
-CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
-
if [ ! -e ./config.h ]; then
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
More information about the Android
mailing list