Browse Source

Split notv builds into apks by arch

merge-requests/1990/head
Nicolas Pomepuy 2 years ago
parent
commit
be9b8d1555
  1. 2
      application/app/build.gradle
  2. 8
      buildsystem/compile.sh

2
application/app/build.gradle

@ -101,7 +101,7 @@ android {
gradle.startParameter.taskNames.find { gradle.startParameter.taskNames.find {
// Enable split for release builds in different build flavors // Enable split for release builds in different build flavors
// (assemblePaidRelease, assembleFreeRelease, etc.). // (assemblePaidRelease, assembleFreeRelease, etc.).
if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase()) { if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase() || it.toLowerCase() ==~ /assembleNoTv/.toLowerCase()) {
isReleaseBuild = true isReleaseBuild = true
return true // break return true // break
} }

8
buildsystem/compile.sh

@ -345,10 +345,10 @@ if [ "$TEST" = 1 ]; then
BUILDTYPE="Debug" BUILDTYPE="Debug"
elif [ "$SIGNED_RELEASE" = 1 ]; then elif [ "$SIGNED_RELEASE" = 1 ]; then
BUILDTYPE="signedRelease" BUILDTYPE="signedRelease"
elif [ "$RELEASE" = 1 ]; then
BUILDTYPE="Release"
elif [ "$NO_TV" = 1 ]; then elif [ "$NO_TV" = 1 ]; then
BUILDTYPE="NoTv" BUILDTYPE="NoTv"
elif [ "$RELEASE" = 1 ]; then
BUILDTYPE="Release"
fi fi
if [ "$FORCE_VLC_4" = 1 ]; then if [ "$FORCE_VLC_4" = 1 ]; then
@ -375,6 +375,10 @@ else
TARGET="bundle${BUILDTYPE}" 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 GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" CLI="" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET
fi 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 if [ "$TEST" = 1 ]; then
TARGET="application:vlc-android:install${BUILDTYPE}AndroidTest" 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 GRADLE_VLC_SRC_DIRS="$GRADLE_VLC_SRC_DIRS" CLI="" GRADLE_ABI=$GRADLE_ABI ./gradlew ${gradle_prop} -Dmaven.repo.local=$M2_REPO $TARGET

Loading…
Cancel
Save