From 983c9678e05471c3011742b68815d24318d1f71c Mon Sep 17 00:00:00 2001 From: Duncan McNamara <dcn.mcnamara@gmail.com> Date: Mon, 17 Mar 2025 12:07:02 +0100 Subject: [PATCH] ReleaseBuild: add amazon bundle Amazon store now requires app bundles, though unlike the play store, it requires API 17+ Fixes #3168 --- application/app/build.gradle | 7 +++++++ buildsystem/gitlab/.gitlab-ci.yml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/application/app/build.gradle b/application/app/build.gradle index 64adb29a2a..212c3be4ed 100644 --- a/application/app/build.gradle +++ b/application/app/build.gradle @@ -70,6 +70,9 @@ android { beforeVariants(selector().withBuildType("vlcBundle")) { variantBuilder -> variantBuilder.minSdk = 30 } + beforeVariants(selector().withBuildType("vlcBundleAmazon")) { variantBuilder -> + variantBuilder.minSdk = 17 + } } buildTypes { @@ -88,6 +91,10 @@ android { initWith release matchingFallbacks = ['release'] } + vlcBundleAmazon { + initWith release + matchingFallbacks = ['release'] + } debug { applicationIdSuffix ".debug" jniDebuggable true diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index 8f9a48611e..3e8ebcb3aa 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -502,11 +502,13 @@ release: - ./buildsystem/compile.sh --init - ./gradlew assembleRelease - ./gradlew bundleVlcBundle + - ./gradlew bundleVlcBundleAmazon artifacts: name: "${CI_COMMIT_TAG}" paths: - application/app/build/outputs/apk/release/VLC-Android-*.apk - application/app/build/outputs/bundle/vlcBundle/*.aab + - application/app/build/outputs/bundle/vlcBundleAmazon/*.aab # - application/app/build/outputs/mapping/release/mapping.txt expire_in: 2 weeks -- GitLab