[Android] Use a dedicated version code for the no tv builds
Nicolas Pomepuy
git at videolan.org
Thu Jun 13 13:13:23 UTC 2024
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jun 13 13:54:00 2024 +0200| [5a856b2af2fdf0df1a3b0e570b20cf83fa312568] | committer: Nicolas Pomepuy
Use a dedicated version code for the no tv builds
> https://code.videolan.org/videolan/vlc-android/commit/5a856b2af2fdf0df1a3b0e570b20cf83fa312568
---
application/app/build.gradle | 9 +++++++--
build.gradle | 15 +++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index 3710646dbd..aa163d71d5 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -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"
diff --git a/build.gradle b/build.gradle
index 69031096ba..025164432f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
}
More information about the Android
mailing list