solenv/gbuild/Jar.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 07e5498fdeaefd72cd86f0413dfaea56724097b3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 5 17:59:01 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Feb 6 07:43:22 2020 +0100
Nothing should link against unoil.jar any more
...after ae855bf48163ff64d94cfc34aff8e37abdb5518d "tdf#117331 Merge jurt and
unoil into ridl", so no need any longer to filter it out of the classpath
here
Change-Id: Ifb01de5d9efa7ed264824030ad0e1333ab8b43ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88054
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 6f86b4a79a42..84d41921f972 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -182,9 +182,8 @@ $(call gb_Jar_get_target,$(1)) : $(2)
endef
-# URE jars are not added to manifest classpath; and neither is unoil.jar, which
-# is available at runtime via URE_MORE_JAVA_TYPES:
-gb_Jar_default_jars := $(gb_Jar_URE) unoil
+# URE jars are not added to manifest classpath:
+gb_Jar_default_jars := $(gb_Jar_URE)
# remember: classpath is "inherited" to ClassSet
define gb_Jar_use_jar
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
