[Android] Fix patches ignored in release builds
Geoffrey Métais
git at videolan.org
Tue Jul 16 16:36:56 CEST 2019
vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Jul 16 16:36:06 2019 +0200| [ba48d0f4995b62240c7eea7af9e8bc2ef64c7561] | committer: Geoffrey Métais
Fix patches ignored in release builds
> https://code.videolan.org/videolan/vlc-android/commit/ba48d0f4995b62240c7eea7af9e8bc2ef64c7561
---
compile.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/compile.sh b/compile.sh
index c9c59db53..f3a9692de 100755
--- a/compile.sh
+++ b/compile.sh
@@ -246,7 +246,9 @@ if [ ! -d "vlc" ]; then
diagnostic "VLC source not found, cloning"
git clone https://git.videolan.org/git/vlc/vlc-3.0.git vlc
checkfail "vlc source: git clone failed"
- cd vlc && git am ../libvlc/patches/vlc3/*.patch && cd ..
+ if [ "$RELEASE" != 1 ]; then
+ cd vlc && git am ../libvlc/patches/vlc3/*.patch && cd ..
+ fi
fi
diagnostic "VLC source found"
cd vlc
@@ -260,6 +262,7 @@ EOF
fi
if [ "$RELEASE" = 1 ]; then
git reset --hard ${TESTED_HASH}
+ git am ../libvlc/patches/vlc3/*.patch
fi
cd ..
More information about the Android
mailing list