Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
8a5e8493
Commit
8a5e8493
authored
5 years ago
by
Thomas Guillem
Committed by
Geoffrey Métais
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gdb: fix script
Use new vlc build paths and fix AndroidManifest location.
parent
f55f1fdf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gdb.sh
+5
-13
5 additions, 13 deletions
gdb.sh
with
5 additions
and
13 deletions
gdb.sh
+
5
−
13
View file @
8a5e8493
...
...
@@ -3,19 +3,10 @@
SCRIPT_PATH
=
$(
dirname
$0
)
TMP_PATH
=
"
$SCRIPT_PATH
"
/.gdb
FLAVOUR
=
vanillaARMv7
NDK_GDB_ARGS
=
"--force"
while
[
$#
-gt
0
]
;
do
case
$1
in
help
|
--help
|
-h
)
echo
"Use -f to set the flavour. Default is vanillaARMv7."
exit
0
;;
-f
)
FLAVOUR
=
$2
shift
;;
-s
)
NDK_GDB_ARGS
=
"
$NDK_GDB_ARGS
--nowait --start"
;;
...
...
@@ -26,17 +17,18 @@ done
rm
-rf
"
$TMP_PATH
"
mkdir
-p
"
$TMP_PATH
"
ANDROID_MANIFEST
=
"
$SCRIPT_PATH
"
/vlc-android/build/intermediates/manifests/
full/
$FLAVOUR
/debug
/AndroidManifest.xml
ANDROID_MANIFEST
=
"
$SCRIPT_PATH
/vlc-android/build/intermediates/
merged_
manifests/
dev
/AndroidManifest.xml
"
if
[
!
-f
"
$ANDROID_MANIFEST
"
]
;
then
echo
"invalid
flavour
, did you try building first
for this flavour
?"
echo
"invalid
manifest
, did you try building first ?"
exit
1
fi
mkdir
-p
"
$TMP_PATH
"
/jni
cp
-r
"
$SCRIPT_PATH
"
/libvlc/jni/libs
"
$TMP_PATH
"
cp
-r
"
$SCRIPT_PATH
"
/libvlc/jni/obj
"
$TMP_PATH
"
cp
-r
"
$SCRIPT_PATH
"
/vlc/build-android-
*
linux-android
*
/ndk/libs
$TMP_PATH
cp
-r
"
$SCRIPT_PATH
"
/vlc/build-android-
*
linux-android
*
/ndk/obj
$TMP_PATH
cp
-r
"
$SCRIPT_PATH
"
/medialibrary/jni/libs
"
$TMP_PATH
"
cp
-r
"
$SCRIPT_PATH
"
/medialibrary/jni/obj
"
$TMP_PATH
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment