[Libreoffice-commits] core.git: android/source ios/CustomTarget_iOS_setup.mk

[Stephan Bergmann (via logerrit)]

 android/source/build.gradle   |    1 -
 ios/CustomTarget_iOS_setup.mk |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit e30b0491977f978077b3fd0d5f8309cce1e1e6cc
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Aug 19 16:56:43 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 19 21:42:59 2020 +0200

    Remove BuildVersion also from Android and iOS version ini files
    
    ...after 5fdf2009d21fa220dfee70ea755bd698c16257a7 "tdf#134522 remove
    --with-build-version ./configure flag", 00fa759dc9f13eb4618a7762be9ca6eaf3fd37f7
    "tdf#135133: Don't try to read BuildVersion", and
    6ee46adb446f5350df2b1efc7fc3ffe2506dfaa0 "Remove BuildVersion from installation
    set version ini files" already removed it from anywhere else
    
    Change-Id: I42ccf35d6952ad0a826517ecadfe0ebb3bb704a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101003
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index fb155b693f4c..32de09f84749 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -284,7 +284,6 @@ task createRCfiles {
         versionrc.text = '''\
             [Version]
             AllLanguages=en-US
-            BuildVersion=
             buildid=''' + "${liboGitFullCommit}" + '''
             ReferenceOOoMajorMinor=4.1
             '''.stripIndent()
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3ed2d5379bbe..d417be34cfed 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -112,7 +112,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 
 	(echo '[Version]' \
 	&& echo 'AllLanguages=en-US' \
-	&& echo 'BuildVersion=' \
 	&& echo "buildid=$(shell git -C $(SRCDIR) log -1 --format=%H)" \
 	    ) > $(IOSRES)/program/versionrc