diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-11-30 15:50:54 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-11-30 17:31:54 +0100 |
| commit | 865033f18e5759bc8f45d72088ace753ae69ffb2 (patch) | |
| tree | b1df5479403b191d60587cfd464c8c7eab081776 /android | |
| parent | 13366298ed648478cd421c61c44b701221db8d08 (diff) | |
android: Add make dep to update build ID more reliably
So far, the build ID in liboSettings.gradle, and
therefore in the about dialog in Android Viewer
was not reliably updated in incremental builds.
For example, after a full build, then
git commit --allow-empty -m "Dummy"
make
, the build ID would still refer to the commit
from the full build, not the new dummy commit.
Since `instdir/program/versionrc` on Linux
and `instdir/program/version.ini` on Windows
gets updated properly, add an optional make
dependency on these files, using a wildcard.
Change-Id: If3b1d4d811a5e4316a26bb17f246b66858dcf80f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160157
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index c3e0257d592f..0cd5ec6fcbda 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -86,7 +86,9 @@ stop-start-cycle: $(ANDROID_SDK_DIR)/platform-tools/adb shell stop && $(ANDROID_SDK_DIR)/platform-tools/adb shell start && sleep 10 # build-host specific stuff (build paths and the like) to keep build.gradle static -liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk $(SRCDIR)/android/Bootstrap/Makefile.shared +liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk \ + $(wildcard $(INSTDIR)/program/version.ini $(INSTDIR)/program/versionrc) \ + $(SRCDIR)/android/Bootstrap/Makefile.shared @echo "creating $@" ( \ echo "// created by Makefile.shared - your changes will be overridden" \ |