diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-11-16 10:47:53 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-17 11:13:38 +0100 |
| commit | a3b6d954bb76a48adc7009b09681ea9008a92213 (patch) | |
| tree | 3a8c20d71007e983cad34b10ea970457b544a75e | |
| parent | ef0fc60440a1742866fc77691f8d7e1e1e1f6c86 (diff) | |
android: Add missing make dependency
After
commit f9b9e702465b4de29153b49e077c70a0ad78c89d
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed Nov 15 13:26:38 2023 +0100
android: Add button to open privacy URL
, Android Jenkins builds started to fail intermittently
(e.g. [1]) like this:
> Task :stripStrippedUIEditingDebugDebugSymbols
> Task :compileStrippedUIEditingDebugJavaWithJavac FAILED
/home/tdf/lode/jenkins/workspace/android_x86/android/source/src/java/org/libreoffice/AboutDialogFragment.java:93: error: cannot find symbol
final String privacyUrl = BuildConfig.PRIVACY_POLICY_URL;
^
symbol: variable PRIVACY_POLICY_URL
location: class BuildConfig
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
1 error
FAILURE: Build failed with an exception.
This seems due to the pre-existing issue of a missing
dependency of the `liboSettings.gradle` target on
`android/Bootstrap/Makefile.shared`, so a change
to the latter would not have caused the former
to be regenerated and any old one still around
that didn't set the new build config variable
would get used, resulting in the above error.
Issue reproducible locally:
* do a local Android master build
* `git revert f9b9e702465b4de29153b49e077c70a0ad78c89d`
* `rm android/source/liboSettings.gradle`
* `make`
* `git cherry-pick f9b9e702465b4de29153b49e077c70a0ad78c89d`
* `make`
[1] https://ci.libreoffice.org/job/gerrit_android_x86/33773/console
Change-Id: I87275fc71d93f460dfad4d75fc197b8ed8cd9922
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159497
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 5d4ecaa33cb5700893f0df9ae2335f65349706b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159532
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 951ee1450ec7..d1177edc1694 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -86,7 +86,7 @@ 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 +liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk $(SRCDIR)/android/Bootstrap/Makefile.shared @echo "creating $@" ( \ echo "// created by Makefile.shared - your changes will be overridden" \ |