[Android] compile.sh: Apply the patches after cloning only

Hugo Beauzée-Luyssen git at videolan.org
Tue May 7 04:09:43 CEST 2019


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon May  6 19:07:56 2019 -0700| [e9f0ab67ddfad93f47fe52d2847bce0b000e580e] | committer: Hugo Beauzée-Luyssen

compile.sh: Apply the patches after cloning only

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

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

diff --git a/compile.sh b/compile.sh
index 82d586aa1..898647cd1 100755
--- a/compile.sh
+++ b/compile.sh
@@ -243,6 +243,7 @@ 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"
+    git am ../libvlc/patches/*.patch
 fi
 diagnostic "VLC source found"
 cd vlc
@@ -257,7 +258,6 @@ fi
 if [ "$RELEASE" = 1 ]; then
     git reset --hard ${TESTED_HASH}
 fi
-git am ../libvlc/patches/*.patch
 cd ..
 
 



More information about the Android mailing list