android: Set archivesBaseName differently after gradle update

Setting the archive base name in build.gradle using

    project.ext.set("archivesBaseName", "LibreOfficeViewer")

no longer worked after

    commit 39326bc7d4
    Date:   Tue Apr 19 15:49:53 2022 +0200

        android: Update Android Gradle Plugin to 7.1.3

        ... and gradle to 7.2, which is what Android Studio suggested
        and did automatically when confirming.

As a consequence, the generated .apk or .aar files
would no longer have the app name in them, but be
called e.g. "source-strippedUIEditing-release-unsigned.apk"
instead of
"LibreOfficeViewer-strippedUIEditing-release-unsigned.apk".

Setting `archivesBaseName` in `android.defaultConfig`
in libOSettings.gradle works, so move it there.

Change-Id: Id03cbe10681aca85c35aeef64527bc7707c95736
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133191
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2022-04-20 08:00:22 +02:00
parent 8e4453c211
commit 19363c84e0
2 changed files with 1 additions and 1 deletions

View File

@@ -108,6 +108,7 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk
&& echo "}" \
&& echo "android.defaultConfig {" \
&& echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \
&& echo " archivesBaseName = 'LibreOfficeViewer'" \
&& echo " versionCode project.hasProperty('cmdVersionCode') ? cmdVersionCode.toInteger() : $(if $(versionCode),$(versionCode),1)" \
&& echo " versionName '$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)/$(shell cd $(SRCDIR) && git log -1 --format=%h)/$(OOO_VENDOR)'" \
&& echo "}" \

View File

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
// buildhost settings - paths and the like
apply from: 'liboSettings.gradle'
project.ext.set("archivesBaseName", "LibreOfficeViewer")
allprojects {
repositories {
jcenter()