[Android] buildsystem: Initialize the submodules after git reset

Hugo Beauzée-Luyssen git at videolan.org
Sun Jun 28 16:51:43 CEST 2020


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jun 18 09:41:28 2020 +0200| [c289ef58a059566487fe7c8a42676b66287bd9d8] | committer: Jean-Baptiste Kempf

buildsystem: Initialize the submodules after git reset

In order to initialize the submodule to the proper version for the
targeted hash

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

 buildsystem/compile-medialibrary.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 9de0c7b17..627da9ed5 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -89,8 +89,8 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/medialibrary" ]; then
   avlc_checkfail "medialibrary source: git clone failed"
   cd ${MEDIALIBRARY_MODULE_DIR}/medialibrary
   #    git checkout 0.5.x
-  git submodule update --init libvlcpp
   git reset --hard ${MEDIALIBRARY_HASH}
+  git submodule update --init libvlcpp
 else
   cd ${MEDIALIBRARY_MODULE_DIR}/medialibrary
   if ! git cat-file -e ${MEDIALIBRARY_HASH}; then



More information about the Android mailing list