[Android] medialibrary: fix build with vlc-4.0

Thomas Guillem git at videolan.org
Thu Nov 14 10:30:14 CET 2019


vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Nov  7 13:43:38 2019 +0100| [f05db3f9b51e64061ff73c794e6a7bfb44f34f65] | committer: Thomas Guillem

medialibrary: fix build with vlc-4.0

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

 compile-medialibrary.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compile-medialibrary.sh b/compile-medialibrary.sh
index bf48aab29..625c031a6 100755
--- a/compile-medialibrary.sh
+++ b/compile-medialibrary.sh
@@ -101,6 +101,9 @@ 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}
 echo -e "\e[1m\e[36mCFLAGS:            ${CFLAGS}\e[0m"



More information about the Android mailing list