diff --git a/application/app/build.gradle b/application/app/build.gradle index c856059a54d93890ba4443151a916f6ef36d6891..34c76a6296e6b35d36fa1236958c92caf46930af 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 34268e5254614633df41ba789bc2bdcd8be85460..76af63069fa25a7c5c523085a2d96e007a9b2c02 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 912924b4c773a58f48125640c436aa16eaa8f0b9..4ad42411b3795a0f4464dfa9e68a1aa941166cbd 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