summaryrefslogtreecommitdiff
path: root/solenv/gbuild/extensions/pre_MergedLibsList.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/extensions/pre_MergedLibsList.mk')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 81a85a25e0c3..172ca7a17fd5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/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 \