[Android] compile-medialibrary: Always use medialib tested hash
Hugo Beauzée-Luyssen
git at videolan.org
Thu Jun 11 06:55:49 CEST 2020
vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Jun 10 10:02:12 2020 +0200| [1b9e0b893a49fc187ed59dd75ac76fcbe043a64a] | committer: Hugo Beauzée-Luyssen
compile-medialibrary: Always use medialib tested hash
Not only for release builds. This will prevent build breakage each time
the medialibrary API changes
> https://code.videolan.org/videolan/vlc-android/commit/1b9e0b893a49fc187ed59dd75ac76fcbe043a64a
---
buildsystem/compile-medialibrary.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 1ee31b6bc..8eb8585b6 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -90,6 +90,7 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/medialibrary" ]; then
cd ${MEDIALIBRARY_MODULE_DIR}/medialibrary
# git checkout 0.5.x
git submodule update --init libvlcpp
+ git reset --hard ${MEDIALIBRARY_HASH}
else
cd ${MEDIALIBRARY_MODULE_DIR}/medialibrary
if ! git cat-file -e ${MEDIALIBRARY_HASH}; then
@@ -98,9 +99,6 @@ else
rm -rf ${MEDIALIBRARY_MODULE_DIR}/jni/obj
fi
fi
-if [ "$RELEASE" = "1" ]; then
- git reset --hard ${MEDIALIBRARY_HASH}
-fi
cd ${SRC_DIR}
#################
More information about the Android
mailing list