Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
580483e1
Commit
580483e1
authored
May 03, 2012
by
Jean-Baptiste Kempf
Browse files
Do not set error mode, since we use grep.
Error mode broke any version not NDKr7
parent
9c345b0b
Changes
1
Hide whitespace changes
Inline
Side-by-side
compile.sh
View file @
580483e1
#! /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
-
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment