Browse Source

Remove remaining NoTv references

merge-requests/1990/merge 3.6.0-beta02
Nicolas Pomepuy 2 years ago
parent
commit
704df40ad6
  1. 2
      application/app/build.gradle
  2. 4
      buildsystem/compile.sh
  3. 2
      buildsystem/gitlab/.gitlab-ci.yml

2
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
}

4
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

2
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

Loading…
Cancel
Save