add javavm and jvmfwk to Library_merged

Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6

Library_merged.mk

@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	cppu \
 	cppuhelper \
 	i18nisolang1 \
-    jvmfwk \
 	sal \
 	salhelper \
 	tl \

solenv/gbuild/Library.mk

@@ -123,8 +123,11 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\
 	$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
 $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_outdir_target,$(2))
+# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component
+ifneq ($(gb_Library__get_name),merged)
 $(call gb_ComponentTarget_get_target,$(2)) :| \
 	$(call gb_Library_get_target,$(gb_Library__get_name))
+endif
 $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_clean_target,$(2))
 endef

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -60,6 +60,8 @@ gb_MERGEDLIBS := \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \
 	i18npool \
 	i18nutil \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \
+	jvmfwk \
 	lng \
 	localebe1 \
 	localedata_en \