Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
Issue boards
Milestones
Wiki
Code
Merge requests
15
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
e5726c1c
Commit
e5726c1c
authored
2 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Bump libs
parent
82936d22
No related branches found
No related tags found
1 merge request
!1632
MediaWrapper: add condition to udpateMeta for title
Pipeline
#303954
passed with stage
in 21 minutes and 45 seconds
Changes
2
Pipelines
11
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+2
-2
2 additions, 2 deletions
build.gradle
buildsystem/compile.sh
+2
-2
2 additions, 2 deletions
buildsystem/compile.sh
with
4 additions
and
4 deletions
build.gradle
+
2
−
2
View file @
e5726c1c
...
...
@@ -42,8 +42,8 @@ ext {
versionCode
=
3050310
versionName
=
project
.
hasProperty
(
'forceVlc4'
)
&&
project
.
getProperty
(
'forceVlc4'
)
?
'4.0.0-preview - '
+
versionCode
:
'3.5.4 Beta 1'
vlcMajorVersion
=
project
.
hasProperty
(
'forceVlc4'
)
&&
project
.
getProperty
(
'forceVlc4'
)
?
4
:
3
libvlcVersion
=
vlcMajorVersion
==
3
?
'3.6.0-eap
2
'
:
'4.0.0-eap
5
'
medialibraryVersion
=
vlcMajorVersion
==
3
?
'0.13.13-rc
2
'
:
'0.13.13-vlc4-rc
2
'
libvlcVersion
=
vlcMajorVersion
==
3
?
'3.6.0-eap
3
'
:
'4.0.0-eap
6
'
medialibraryVersion
=
vlcMajorVersion
==
3
?
'0.13.13-rc
3
'
:
'0.13.13-vlc4-rc
3
'
minSdkVersion
=
17
targetSdkVersion
=
33
compileSdkVersion
=
33
...
...
This diff is collapsed.
Click to expand it.
buildsystem/compile.sh
+
2
−
2
View file @
e5726c1c
...
...
@@ -259,9 +259,9 @@ fi
if
[
"
$FORCE_VLC_4
"
=
1
]
;
then
LIBVLCJNI_TESTED_HASH
=
87f8b851295b0e534aedc1fd4117dde73e9bf94a
LIBVLCJNI_TESTED_HASH
=
720bd2afb4a1eb83aa363656f2a7a375efc1e75c
else
LIBVLCJNI_TESTED_HASH
=
d41f1378672d628425c17c07c32e474270ea2b31
LIBVLCJNI_TESTED_HASH
=
6691a43c73df3abe3e30bda139c6a7b4d1adda87
fi
LIBVLCJNI_REPOSITORY
=
https://code.videolan.org/videolan/libvlcjni
...
...
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