From 2ab57d188e4fba779e5e9ced85cd702ae5d73025 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Fri, 4 Oct 2024 08:51:26 +0200
Subject: [PATCH] Remove the notv build
---
application/app/build.gradle | 9 ---------
application/donations/build.gradle | 4 ----
application/live-plot-graph/build.gradle | 4 ----
application/mediadb/build.gradle | 4 ----
application/moviepedia/build.gradle | 4 ----
application/resources/build.gradle | 6 ------
application/television/build.gradle | 4 ----
application/tools/build.gradle | 4 ----
application/vlc-android/build.gradle | 5 -----
application/webserver/build.gradle | 4 ----
10 files changed, 48 deletions(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index 00d622caad..c856059a54 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -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
}
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index c7da3c4956..2d7d1bf3f4 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -60,10 +60,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index 9e38f7534d..32396eec91 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -41,10 +41,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 14bcb38df2..02ef2569e1 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -53,10 +53,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index b8ad6b324c..5dc1408495 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -39,10 +39,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index fe26b34c46..44b0486296 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -30,10 +30,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
@@ -72,8 +68,6 @@ dependencies {
debugApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
releaseApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
releaseApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
- noTvApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
- noTvApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
vlcBundleApi "org.videolan.android:libvlc-all:$rootProject.ext.libvlcVersion"
vlcBundleApi "org.videolan.android:medialibrary-all:$rootProject.ext.medialibraryVersion"
diff --git a/application/television/build.gradle b/application/television/build.gradle
index 6c6bc307d7..5b5c58c2f7 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -33,10 +33,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/tools/build.gradle b/application/tools/build.gradle
index aabe6328f3..3ae05a583b 100644
--- a/application/tools/build.gradle
+++ b/application/tools/build.gradle
@@ -17,10 +17,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 6963b2705f..f7f06b7880 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -76,11 +76,6 @@ android {
buildConfigField "boolean", "NO_TV", "false"
multiDexEnabled true
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- buildConfigField "boolean", "NO_TV", "true"
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
diff --git a/application/webserver/build.gradle b/application/webserver/build.gradle
index 41b13c4e08..1006beb2c0 100644
--- a/application/webserver/build.gradle
+++ b/application/webserver/build.gradle
@@ -31,10 +31,6 @@ android {
initWith debug
matchingFallbacks = ['debug']
}
- noTv {
- initWith release
- matchingFallbacks = ['release']
- }
vlcBundle {
initWith release
matchingFallbacks = ['release']
--
GitLab