[Android] compile-medialibrary.sh: Remove now unneeded cherry-pick

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:01:13 2020 +0200| [6ddb1f5b48480aabf620d7597e161aa4fd28e073] | committer: Hugo Beauzée-Luyssen

compile-medialibrary.sh: Remove now unneeded cherry-pick

This was required when building from medialib 0.6 branch, but the commit
is already on master which we now use

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

 buildsystem/compile-medialibrary.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 8aca3dad9..1ee31b6bc 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -100,9 +100,6 @@ else
 fi
 if [ "$RELEASE" = "1" ]; then
   git reset --hard ${MEDIALIBRARY_HASH}
-  # In case of VLC 4.0 build, we need this commit to fix the build, but we
-  # still don't want to change the HASH for that.
-  git cherry-pick bfb2ad6e8b34a62c482e3064e6e13751482b903f
 fi
 cd ${SRC_DIR}
 



More information about the Android mailing list