diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2022-04-20 08:00:22 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-04-20 10:45:59 +0200 |
| commit | 19363c84e0f9a19e3114cdac2393c81d58865daf (patch) | |
| tree | af7f3a607712c3f45d8ac6758ab4aaa132cb4219 /android | |
| parent | 8e4453c2117b6c3bb15be6b949a0a8a43df66647 (diff) | |
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 39326bc7d439170dd24c9d4b837c2cdb720b5d6f
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>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | android/source/build.gradle | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 83a2383581e4..74121e6f03b4 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -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 "}" \ diff --git a/android/source/build.gradle b/android/source/build.gradle index 118d7c53d86e..43a22c3b31a8 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -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() |