Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
1ebdb48b
Commit
1ebdb48b
authored
Mar 31, 2016
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 'run' action for compile script
parent
45888128
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
compile.sh
compile.sh
+8
-5
No files found.
compile.sh
View file @
1ebdb48b
...
...
@@ -202,7 +202,12 @@ if [ "$BUILD_LIBVLC" = 1 ];then
RUN
=
0
CHROME_OS
=
0
else
TARGET
=
"assemble
${
PLATFORM
}${
GRADLE_ABI
}${
BUILDTYPE
}
"
if
[
"
$RUN
"
=
1
]
;
then
ACTION
=
"install"
else
ACTION
=
"assemble"
fi
TARGET
=
"
${
ACTION
}${
PLATFORM
}${
GRADLE_ABI
}${
BUILDTYPE
}
"
PASSWORD_KEYSTORE
=
"
$PASSWORD_KEYSTORE
"
./gradlew
$TARGET
fi
...
...
@@ -213,11 +218,9 @@ if [ "$RUN" = 1 ]; then
export
PATH
=
${
ANDROID_SDK
}
/platform-tools/:
$PATH
adb wait-for-device
if
[
"
$RELEASE
"
=
1
]
;
then
adb
install
-r
vlc-android/build/outputs/apk/vlc-android-vanilla-release.apk
adb shell am start
-n
org.videolan.vlc/org.videolan.vlc.gui.MainActivity
adb shell am start
-n
org.videolan.vlc/org.videolan.vlc.StartActivity
else
adb
install
-r
vlc-android/build/outputs/apk/vlc-android-vanilla-debug.apk
adb shell am start
-n
org.videolan.vlc.debug/org.videolan.vlc.gui.MainActivity
adb shell am start
-n
org.videolan.vlc.debug/org.videolan.vlc.StartActivity
fi
fi
...
...
Write
Preview
Markdown
is supported
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