commit c63148ba139bd6b9ae7a0f9e24e51f29e5370963
author Noel Grandin <noel.grandin@collabora.co.uk> Wed Mar 11 07:51:54 2020 +0100
committer Noel Grandin <noel.grandin@collabora.co.uk> Wed Mar 11 08:36:39 2020 +0100
tree fee101874fc4d88f6e0e4bc6264963bfe6ba6b94
parent 6b40c791b50bcadbdd62f990adf08e783902144f

Revert "Revert "add some libs to libmerged""

This reverts commit b8077713987253f6db0887ddad56fd6871374a8b.

Reason for revert: 

Change-Id: I09b7d548a674fc8b2991be00616a7e95ec7d1444
sberg:You can probably reverts this again, as <https://ci.libreoffice.org/job/lo_daily_tb_win/162/> now succeeded with <https://gerrit.libreoffice.org/plugins/gitiles/core/+/9ed75e2c65544b4f71c73e1c51a68d74e31d544b%5E!/> "Properly use createOneInstanceComponentFactory for javaloader".
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90275
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

solenv/gbuild/extensions/pre_MergedLibsList.mk

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 9cb91a5..976de14 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -83,13 +83,24 @@ MERGE_LIBRARY_LIST := \
	svx \
	svxcore \
	syssh \
	textfd \
	tk \
	tl \
	ucb1 \
	ucbhelper \
	ucpexpand1 \
	ucpext \
	ucphier1 \
	ucpimage \
	ucpfile1 \
	ucptdoc1 \
	unordf \
	unoxml \
	$(if $(ENABLE_ONLINE_UPDATE), \
		updatecheckui \
        updchk \
	) \
	updatefeed \
	utl \
	uui \
	vcl \