[Android] Do not set error mode, since we use grep.

[Jean-Baptiste Kempf]

android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May  3 14:54:48 2012 +0200| [580483e145b7c48fd38ae85a7c1f87fdaa330cfa] | committer: Jean-Baptiste Kempf

Do not set error mode, since we use grep.

Error mode broke any version not NDKr7

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

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

diff --git a/compile.sh b/compile.sh
index 6cd51df..5635fbd 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,7 +1,5 @@
 #! /bin/sh
 
-set -e
-
 # Read the Android HOWTO and setup all that stuff correctly.
 # Get the Android SDK Platform 2.1, 2.2 and 2.3 API : version 7, 8 and (9 or 10)
 # or modify numbers in configure.sh and vlc-android/default.properties.
@@ -49,9 +47,11 @@ else
     echo "VLC source found, updating"
     cd vlc
     git fetch origin
-    if git branch | grep -q '* android$'; then
+    if git branch | grep -q '.*android$'; then
+        echo "Android branch found, merging"
         git merge ${TESTED_HASH}
     else
+        echo "Creating android branch"
         git checkout -B android ${TESTED_HASH}
     fi
     cd -