Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
532
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
Merge requests
!1995
Remove the notv build
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Remove the notv build
Aza/vlc-android:remove_notv
into
master
Overview
0
Commits
1
Pipelines
2
Changes
10
Merged
Nicolas Pomepuy
requested to merge
Aza/vlc-android:remove_notv
into
master
4 months ago
Overview
0
Commits
1
Pipelines
2
Changes
10
Expand
0
0
Merge request reports
Compare
master
version 1
4d5db4e3
4 months ago
master (base)
and
latest version
latest version
2ab57d18
1 commit,
4 months ago
version 1
4d5db4e3
1 commit,
4 months ago
10 files
+
0
−
48
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
10
Search (e.g. *.vue) (Ctrl+P)
application/app/build.gradle
+
0
−
9
Options
@@ -80,10 +80,6 @@ android {
signingConfig
=
signingConfigs
.
release
matchingFallbacks
=
[
'release'
]
}
noTv
{
initWith
release
matchingFallbacks
=
[
'release'
]
}
vlcBundle
{
initWith
release
matchingFallbacks
=
[
'release'
]
@@ -125,7 +121,6 @@ android {
}
def
abiCodes
=
[
'armeabi-v7a'
:
5
,
'arm64-v8a'
:
6
,
'x86'
:
7
,
'x86_64'
:
8
]
def
abiCodesNoTv
=
[
'armeabi-v7a'
:
1
,
'arm64-v8a'
:
2
,
'x86'
:
3
,
'x86_64'
:
4
]
lint
{
abortOnError
false
disable
'MissingTranslation'
,
'ExtraTranslation'
@@ -139,9 +134,6 @@ android {
def
abiName
=
System
.
getenv
(
'GRADLE_ABI'
)?.
toLowerCase
()
?:
"all"
if
(
outputAbi
!=
null
)
abiName
=
outputAbi
def
versionCode
=
abiCodes
.
get
(
abiName
,
0
)
if
(
variant
.
buildType
.
name
==
"noTv"
)
{
versionCode
=
abiCodesNoTv
.
get
(
abiName
,
0
)
}
if
(
variant
.
buildType
.
name
==
"vlcBundle"
)
{
versionCode
=
9
}
@@ -150,7 +142,6 @@ android {
def
outputName
=
"VLC-Android-"
outputName
+=
variant
.
versionName
.
replace
(
" "
,
"-"
)
if
(
variant
.
buildType
.
name
==
"debug"
)
outputName
+=
"-debug"
if
(
variant
.
buildType
.
name
==
"noTv"
)
outputName
+=
"-no-tv"
outputName
+=
"-"
+
abiName
+
".apk"
output
.
outputFileName
=
outputName
}
Loading