add javaloader, java_uno, juh, and jvmaccess to Library_merged

Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f

Library_merged.mk

@@ -87,12 +87,6 @@ $(eval $(call gb_Library_use_externals,merged,\
 ))
 endif
 
-ifneq ($(OS),IOS)
-$(eval $(call gb_Library_use_libraries,merged,\
-	jvmaccess \
-))
-endif
-
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_use_externals,merged,\
 	fontconfig \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -70,7 +70,11 @@ gb_MERGEDLIBS := \
 	hyphen \
 	i18npool \
 	i18nutil \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),juh) \
+	$(if $(filter-out IOS,$(OS)),jvmaccess) \
 	jvmfwk \
 	lng \
 	lnth \