solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 48b3894f74679a1624a92aabaabed29b90ef60cf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Feb 24 11:27:04 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Feb 24 13:44:50 2022 +0100
Keep URE libraries out of Library_merged
...to keep the (at least conceptional, but also reflected in how e.g. Linux
distros split up LO into multiple packages) distinction between URE and LO
proper. This partially reverts 424a7f404565e068995e2a9827d5bc6f76920ec8
"add
some more libs to libmerged".
Change-Id: I0bd435d9fe4dc4a4ad230990a999ad5e8c487cdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130490
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 693d3bde824d..b2402ec0c2af 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -48,9 +48,6 @@ gb_MERGE_LIBRARY_LIST := \
i18nsearch \
i18npool \
i18nutil \
- io \
- $(if $(ENABLE_JAVA),javaloader) \
- $(if $(ENABLE_JAVA),javavm) \
lng \
lnth \
localebe1 \
