Commit 8f2c4370 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove numerous exports, and document them

parent 57c57a43
...@@ -178,9 +178,6 @@ fi ...@@ -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" 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}" 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? # Release or not?
if [ "$RELEASE" = 1 ]; then if [ "$RELEASE" = 1 ]; then
OPTS="" OPTS=""
...@@ -290,6 +287,9 @@ mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE} ...@@ -290,6 +287,9 @@ mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_TUPLE}
# CONFIGURE # # 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" \ CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \ CFLAGS="$CFLAGS ${VLC_EXTRA_CFLAGS} ${EXTRA_CFLAGS}" \
CXXFLAGS="$CFLAGS" \ CXXFLAGS="$CFLAGS" \
......
...@@ -46,7 +46,6 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then ...@@ -46,7 +46,6 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
FETCH=1 FETCH=1
fi fi
HAVE_ARM=0
HAVE_64=0 HAVE_64=0
# Set up ABI variables # Set up ABI variables
...@@ -66,13 +65,11 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then ...@@ -66,13 +65,11 @@ elif [ ${ANDROID_ABI} = "mips" ] ; then
elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
TARGET_TUPLE="aarch64-linux-android" TARGET_TUPLE="aarch64-linux-android"
PATH_HOST=$TARGET_TUPLE PATH_HOST=$TARGET_TUPLE
HAVE_ARM=1
HAVE_64=1 HAVE_64=1
PLATFORM_SHORT_ARCH="arm64" PLATFORM_SHORT_ARCH="arm64"
else else
TARGET_TUPLE="arm-linux-androideabi" TARGET_TUPLE="arm-linux-androideabi"
PATH_HOST=$TARGET_TUPLE PATH_HOST=$TARGET_TUPLE
HAVE_ARM=1
PLATFORM_SHORT_ARCH="arm" PLATFORM_SHORT_ARCH="arm"
fi fi
...@@ -94,16 +91,13 @@ case "$REL" in ...@@ -94,16 +91,13 @@ case "$REL" in
;; ;;
esac esac
export GCCVER export GCCVER # Android.mk
export ANDROID_API export ANDROID_API # Android.mk for -21
SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
export TARGET_TUPLE SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
export PATH_HOST export SYSROOT # Makefile for android-libs
export HAVE_ARM export TARGET_TUPLE # Makefile for android-libs
export HAVE_64 export HAVE_64 # Makefile for libiomx.so.*
export SYSROOT
# Add the NDK toolchain to the PATH, needed both for contribs and for building # Add the NDK toolchain to the PATH, needed both for contribs and for building
# stub libraries # stub libraries
...@@ -228,7 +222,6 @@ export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS ...@@ -228,7 +222,6 @@ 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
export TARGET_TUPLE=$TARGET_TUPLE export TARGET_TUPLE=$TARGET_TUPLE
export PATH_HOST=$PATH_HOST
export RELEASE=$RELEASE export RELEASE=$RELEASE
EssentialsA EssentialsA
...@@ -236,7 +229,4 @@ EssentialsA ...@@ -236,7 +229,4 @@ EssentialsA
echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >> env.sh echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >> env.sh
# CPU flags # 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 echo "export HAVE_64=${HAVE_64}" >> env.sh
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