[Android] build: expose VLC_SRC_DIR and VLC_BUILD_DIR

[Thomas Guillem]

vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri May 10 16:51:42 2019 +0200| [ca72181c352dcb1495725d8f91685395f1aa6f3a] | committer: Thomas Guillem

build: expose VLC_SRC_DIR and VLC_BUILD_DIR

> https://code.videolan.org/videolan/vlc-android/commit/ca72181c352dcb1495725d8f91685395f1aa6f3a
---

 compile-libvlc.sh       | 13 ++++---------
 compile-medialibrary.sh |  2 --
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 3402ef5aa..305aa4c63 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -155,6 +155,10 @@ else
     NDK_DEBUG=1
 fi
 
+SRC_DIR=$PWD
+VLC_SRC_DIR="$SRC_DIR/vlc"
+VLC_BUILD_DIR=`realpath $VLC_SRC_DIR/build-android-${TARGET_TUPLE}`
+
 avlc_checkfail()
 {
     if [ ! $? -eq 0 ];then
@@ -423,8 +427,6 @@ VLC_MODULE_BLACKLIST="
     .dummy
 "
 
-SRC_DIR=$PWD
-
 ###########################
 # Build buildsystem tools #
 ###########################
@@ -440,7 +442,6 @@ make $MAKEFLAGS .gas || make $MAKEFLAGS .buildgas
 avlc_checkfail "buildsystem tools: make failed"
 cd ../../..
 
-VLC_SRC_DIR="$SRC_DIR/vlc"
 VLC_CONTRIB="$VLC_SRC_DIR/contrib/$TARGET_TUPLE"
 
 cd vlc
@@ -501,12 +502,6 @@ avlc_checkfail "contribs: make failed"
 
 cd ../../
 
-###################
-# BUILD DIRECTORY #
-###################
-
-VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
-VLC_BUILD_DIR=`realpath ${VLC_BUILD_DIR}`
 mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 
 #############
diff --git a/compile-medialibrary.sh b/compile-medialibrary.sh
index 9c14d3325..17d6037cc 100755
--- a/compile-medialibrary.sh
+++ b/compile-medialibrary.sh
@@ -39,8 +39,6 @@ if [ -z "$ANDROID_ABI" ]; then
     exit 1
 fi
 
-SRC_DIR=$PWD
-
 AVLC_SOURCED=1 . ./compile-libvlc.sh
 avlc_make_toolchain