mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not add unoil.jar to manifest Class-Path

Browse Source 
...it must implicitly be loaded by the UNO type manager classloader anyway (via
URE_MORE_JAVA_TYPES), so not explicitly mentioning it can help find problems
early should it /not/ already be loaded by the type manager classloader.

Change-Id: I35b4f2804b68a35682e93699840101a15317a096
This commit is contained in:
Stephan Bergmann
2013-05-08 09:06:47 +02:00
parent b1e88b0dd5
commit c7b423d0fd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
solenv/gbuild/Jar.mk
View File

@@ -217,8 +217,9 @@ $$(call gb_Output_error,\
gb_Jar_add_jar: use gb_Jar_use_jar instead.)
endef
# URE jars are not added to manifest classpath
gb_Jar_default_jars := $(gb_Jar_URE)
# 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
# remember: classpath is "inherited" to ClassSet
define gb_Jar_use_jar