Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
13
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
5a856b2a
Commit
5a856b2a
authored
8 months ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Use a dedicated version code for the no tv builds
parent
be9b8d15
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1913
No tv for stores with unacceptable demands 👀
Pipeline
#480442
passed with stage
in 22 minutes and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/app/build.gradle
+7
-2
7 additions, 2 deletions
application/app/build.gradle
build.gradle
+15
-0
15 additions, 0 deletions
build.gradle
with
22 additions
and
2 deletions
application/app/build.gradle
+
7
−
2
View file @
5a856b2a
...
...
@@ -114,7 +114,8 @@ android {
}
}
def
abiCodes
=
[
'x86'
:
5
,
'x86_64'
:
8
,
'armeabi-v7a'
:
4
,
'arm64-v8a'
:
7
]
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'
...
...
@@ -127,7 +128,11 @@ android {
def
outputAbi
=
output
.
getFilter
(
com
.
android
.
build
.
OutputFile
.
ABI
)
def
abiName
=
System
.
getenv
(
'GRADLE_ABI'
)?.
toLowerCase
()
?:
"all"
if
(
outputAbi
!=
null
)
abiName
=
outputAbi
output
.
versionCodeOverride
=
10000000
+
defaultConfig
.
versionCode
+
abiCodes
.
get
(
abiName
,
0
)
def
versionCode
=
abiCodes
.
get
(
abiName
,
0
)
if
(
variant
.
buildType
.
name
==
"noTv"
)
{
versionCode
=
abiCodesNoTv
.
get
(
abiName
,
0
)
}
output
.
versionCodeOverride
=
10000000
+
defaultConfig
.
versionCode
+
versionCode
def
outputName
=
"VLC-Android-"
outputName
+=
variant
.
versionName
.
replace
(
" "
,
"-"
)
if
(
variant
.
buildType
.
name
==
"debug"
)
outputName
+=
"-debug"
...
...
This diff is collapsed.
Click to expand it.
build.gradle
+
15
−
0
View file @
5a856b2a
...
...
@@ -89,6 +89,10 @@ ext {
// NN: Minor version from 00 to 99
// RR: Micro/Revision version from 00 to 99
// AA: ABI from 0 to 99
// Starting from 13050420 the last digit represents the ABI and the variant (normal or NoTv)
// Also, the values are sorted to allow the most pertinent version to be prioritized
//
// Old values
// 0 is dev
// 1 was ARMv5 (deprecated)
// 2 was ARMv6-nofpu (deprecated)
...
...
@@ -99,4 +103,15 @@ ext {
// 7 is ARMv8
// 8 is x86_64
// 9 is MIPS64
//
// New values
// 0 is dev
// 1 is ARMv7-A No TV
// 2 is ARMv8 No TV
// 3 is x86 No TV
// 4 is x86_64 No TV
// 5 is ARMv7-A
// 6 is ARMv8
// 7 is x86
// 8 is ARMv7-A
}
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