[Android] Split notv builds into apks by arch

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jun 13 10:00:58 2024 +0200| [be9b8d1555abb2cc450f278d73618b87999fbf59] | committer: Nicolas Pomepuy

Split notv builds into apks by arch

> https://code.videolan.org/videolan/vlc-android/commit/be9b8d1555abb2cc450f278d73618b87999fbf59
---

 application/app/build.gradle | 2 +-
 buildsystem/compile.sh       | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/app/build.gradle b/application/app/build.gradle
index f041e070b2..3710646dbd 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -101,7 +101,7 @@ android {
             gradle.startParameter.taskNames.find {
                 // Enable split for release builds in different build flavors
                 // (assemblePaidRelease, assembleFreeRelease, etc.).
-                if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase()) {
+                if (it.toLowerCase() ==~ /assemble.*Release/.toLowerCase() || it.toLowerCase() ==~ /assembleNoTv/.toLowerCase()) {
                     isReleaseBuild = true
                     return true // break
                 }
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index ca1c527e4d..34268e5254 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -345,10 +345,10 @@ if [ "$TEST" = 1 ]; then
     BUILDTYPE="Debug"
 elif [ "$SIGNED_RELEASE" = 1 ]; then
     BUILDTYPE="signedRelease"
-elif [ "$RELEASE" = 1 ]; then
-    BUILDTYPE="Release"
 elif [ "$NO_TV" = 1 ]; then
     BUILDTYPE="NoTv"
+elif [ "$RELEASE" = 1 ]; then
+    BUILDTYPE="Release"
 fi
 
 if [ "$FORCE_VLC_4" = 1 ]; then
@@ -375,6 +375,10 @@ 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