summaryrefslogtreecommitdiff
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-02-24 11:27:04 +0100
committerStephan Bergmann <sbergman@redhat.com>2022-02-24 13:44:50 +0100
commit48b3894f74679a1624a92aabaabed29b90ef60cf (patch)
treed5ab22f70c17f59fcdcbc54adc1e7ad1c7db16a9 /solenv/gbuild/extensions
parente63ad6a1363a8bd0c40e8a84073c2f6b22f1e953 (diff)
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.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk3
1 files changed, 0 insertions, 3 deletions
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 \