[Libreoffice-commits] core.git: Branch 'libreoffice-7-6-3' - android/source

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit acfb7e17831d4d1f9491c599106fc651e51e6146
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Nov 7 17:27:49 2023 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 16 23:29:12 2023 +0100

    android: Don't add "-editing" suffix to version/vendor
    
    Don't append "-editing" to the version string, which
    would then end up to be something like
    "24.2.0.0.alpha0+/7763190f7ec2/The Document Foundation-editing"
    when the build was configured with
    `--with-vendor="The Document Foundation"` and would result
    in the "About" dialog/widget saying
    "This release was supplied by The Document Foundation-editing."
    (s. `AboutDialogFragment#onCreateDialog`).
    
    While it's useful to have the different build flavors
    (with or without the experimental editing support), I see no need
    to have the build config reflected in the version string.
    (Whether experimental editing support was enabled during the
    build can easily be seen by checking whether the "Experimental
    Mode" option is available in the settings.)
    
    Change-Id: I48ddb3a842b9db4fc1f435683ed9d8e8e85898ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159079
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    (cherry picked from commit b51a57e5ef15c9b09b8cda0a950231d234ae931b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159041
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index d4776c88de90..e931124577b1 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -82,7 +82,6 @@ android {
         strippedUIEditing {
             dimension "default"
             buildConfigField 'boolean', 'ALLOW_EDITING', 'true'
-            versionNameSuffix "-editing"
         }
         fullUI.dimension "default"
     }