[Android] Use vlc.git, with a known to work hash in case further updates break.

Rafaël Carré git at videolan.org
Sat Mar 10 01:57:18 CET 2012


android | branch: master | Rafaël Carré <funman at videolan.org> | Fri Mar  9 13:53:06 2012 -0500| [2503f5dcc70ed96026fa0345e6ab08e055b7d52d] | committer: Rafaël Carré

Use vlc.git, with a known to work hash in case further updates break.

Checkout this hash in 'android' branch.
Using reset --hard could delete work without noticing it.

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=2503f5dcc70ed96026fa0345e6ab08e055b7d52d
---

 compile.sh |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compile.sh b/compile.sh
index 28c5624..92f54a8 100755
--- a/compile.sh
+++ b/compile.sh
@@ -38,14 +38,16 @@ fi
 export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-
+TESTED_HASH=797ca65c8f
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
-    git clone git://git.videolan.org/vlc/vlc-2.0.git vlc
+    git clone git://git.videolan.org/vlc.git vlc
+    git checkout -B android ${TESTED_HASH}
 else
-    echo "VLC source found, pulling from remote master"
+    echo "VLC source found, updating"
     cd vlc
-    git pull origin master
+    git fetch origin
+    git checkout -B android ${TESTED_HASH}
     cd -
 fi
 



More information about the Android mailing list