From 704df40ad64972cd0c48bd1d3c1a9780f7788913 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Fri, 11 Oct 2024 12:57:40 +0200
Subject: [PATCH] Remove remaining NoTv references
---
application/app/build.gradle | 2 +-
buildsystem/compile.sh | 4 ----
buildsystem/gitlab/.gitlab-ci.yml | 2 --
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index c856059a54..34c76a6296 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -107,7 +107,7 @@ android {
gradle.startParameter.taskNames.find {
// Enable split for release builds in different build flavors
// (assemblePaidRelease, assembleFreeRelease, etc.).
- if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase() || it.toLowerCase() ==~ /assembleNoTv/.toLowerCase()) {
+ if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase()) {
isReleaseBuild = true
return true // break
}
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 34268e5254..76af63069f 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -375,10 +375,6 @@ else
TARGET="bundle${BUILDTYPE}"
GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" CLI="" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
fi
- if [ "$BUILDTYPE" = "NoTv" -a "$ACTION" = "assemble" ]; then
- TARGET="bundle${BUILDTYPE}"
- GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" CLI="" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
- fi
if [ "$TEST" = 1 ]; then
TARGET="application:vlc-android:install${BUILDTYPE}AndroidTest"
GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" CLI="" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 912924b4c7..4ad42411b3 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -487,12 +487,10 @@ release:
- ./buildsystem/compile.sh --init
- ./gradlew assembleRelease
- ./gradlew bundleVlcBundle
- - ./gradlew assembleNoTv
artifacts:
name: "${CI_COMMIT_TAG}"
paths:
- application/app/build/outputs/apk/release/VLC-Android-*.apk
- - application/app/build/outputs/apk/noTv/VLC-Android-*.apk
- application/app/build/outputs/bundle/vlcBundle/*.aab
# - application/app/build/outputs/mapping/release/mapping.txt
expire_in: 2 weeks
--
GitLab