[Android] Move build scripts in a dedicated folder

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Dec 20 09:19:22 2019 +0100| [717b611c120e391cb63cb3cbe3e712a3fc9e9b7a] | committer: Geoffrey Métais

Move build scripts in a dedicated folder

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

 api/build.gradle                                               | 2 +-
 compile-libvlc.sh => buildsystem/compile-libvlc.sh             | 0
 compile-medialibrary.sh => buildsystem/compile-medialibrary.sh | 2 +-
 compile.sh => buildsystem/compile.sh                           | 5 +++--
 .gitlab-ci.yml => buildsystem/gitlab/.gitlab-ci.yml            | 0
 publish.gradle => buildsystem/publish.gradle                   | 0
 libvlc/build.gradle                                            | 2 +-
 medialibrary/build.gradle                                      | 2 +-
 8 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index bc681a3cb..051c77835 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -56,4 +56,4 @@ dependencies {
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
 }
 
-apply from: '../publish.gradle'
+apply from: '../buildsystem/publish.gradle'
diff --git a/compile-libvlc.sh b/buildsystem/compile-libvlc.sh
similarity index 100%
rename from compile-libvlc.sh
rename to buildsystem/compile-libvlc.sh
diff --git a/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
similarity index 99%
rename from compile-medialibrary.sh
rename to buildsystem/compile-medialibrary.sh
index 79b65d683..7f1d589ee 100755
--- a/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -24,7 +24,7 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-AVLC_SOURCED=1 . ./compile-libvlc.sh
+AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
 avlc_make_toolchain
 
 ################
diff --git a/compile.sh b/buildsystem/compile.sh
similarity index 98%
rename from compile.sh
rename to buildsystem/compile.sh
index 5a647e053..8f5dee2f3 100755
--- a/compile.sh
+++ b/buildsystem/compile.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 set -e
 
+
 #############
 # FUNCTIONS #
 #############
@@ -309,7 +310,7 @@ compile() {
     mkdir -p $OUT_DBG_DIR
 
     if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/$1" ]; then
-        AVLC_SOURCED=1 . ./compile-libvlc.sh
+        AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
         avlc_build
 
         $NDK_BUILD -C libvlc \
@@ -332,7 +333,7 @@ compile() {
     fi
 
     if [ "$NO_ML" != 1 ]; then
-        ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE ./compile-medialibrary.sh
+        ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE buildsystem/compile-medialibrary.sh
         if [ "$copy_tmp" = "--copy-tmp=medialibrary" ];then
             cp -r medialibrary/jni/libs/${ANDROID_ABI} build/tmp
         fi
diff --git a/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to buildsystem/gitlab/.gitlab-ci.yml
diff --git a/publish.gradle b/buildsystem/publish.gradle
similarity index 100%
rename from publish.gradle
rename to buildsystem/publish.gradle
diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index 028cc085b..1db6cf75c 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -75,4 +75,4 @@ def vlcRevision() {
     return vlc.toString()
 }
 
-apply from: '../publish.gradle'
+apply from: '../buildsystem/publish.gradle'
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index 94b7f9898..da001bbd8 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -103,4 +103,4 @@ dependencies {
 
 }
 
-apply from: '../publish.gradle'
+apply from: '../buildsystem/publish.gradle'