From 8f2c4370c44cc595ad3e9902b0b5003e0cf8329b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 4 Feb 2015 20:11:41 +0100
Subject: [PATCH] Remove numerous exports, and document them

---
 compile-libvlc.sh |  6 +++---
 compile.sh        | 22 ++++++----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 885aed5a7..db8319951 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -178,9 +178,6 @@ fi
 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}"
 
-ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
-CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
-
 # Release or not?
 if [ "$RELEASE" = 1 ]; then
     OPTS=""
@@ -290,6 +287,9 @@ mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
 # CONFIGURE #
 #############
 
+ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
+CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
+
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
 CXXFLAGS="$CFLAGS" \
diff --git a/compile.sh b/compile.sh
index 6e359c372..8b107fd68 100755
--- a/compile.sh
+++ b/compile.sh
@@ -46,7 +46,6 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
     FETCH=1
 fi
 
-HAVE_ARM=0
 HAVE_64=0
 
 # Set up ABI variables
@@ -66,13 +65,11 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then
 elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
     TARGET_TUPLE="aarch64-linux-android"
     PATH_HOST=$TARGET_TUPLE
-    HAVE_ARM=1
     HAVE_64=1
     PLATFORM_SHORT_ARCH="arm64"
 else
     TARGET_TUPLE="arm-linux-androideabi"
     PATH_HOST=$TARGET_TUPLE
-    HAVE_ARM=1
     PLATFORM_SHORT_ARCH="arm"
 fi
 
@@ -94,16 +91,13 @@ case "$REL" in
     ;;
 esac
 
-export GCCVER
-export ANDROID_API
-SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
-
+export GCCVER            # Android.mk
+export ANDROID_API       # Android.mk for -21
 
-export TARGET_TUPLE
-export PATH_HOST
-export HAVE_ARM
-export HAVE_64
-export SYSROOT
+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.*
 
 # Add the NDK toolchain to the PATH, needed both for contribs and for building
 # stub libraries
@@ -228,7 +222,6 @@ export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
 export ANDROID_LIBS=$ANDROID_LIBS
 export VLC_BUILD_DIR=$VLC_BUILD_DIR
 export TARGET_TUPLE=$TARGET_TUPLE
-export PATH_HOST=$PATH_HOST
 export RELEASE=$RELEASE
 EssentialsA
 
@@ -236,7 +229,4 @@ EssentialsA
 echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >> env.sh
 
 # CPU flags
-echo "export HAVE_ARM=${HAVE_ARM}" >> env.sh
-
-echo "export NO_ARMV6=${NO_ARMV6}" >> env.sh
 echo "export HAVE_64=${HAVE_64}" >> env.sh
-- 
GitLab