diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-05-18 12:09:03 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-27 11:40:40 +0200 |
| commit | 89cb33dde0c4cd27ca05e31ddea94b7129bc6ebb (patch) | |
| tree | 2d894be3cd27e4fee01dc04f5f0451f36492faba /solenv | |
| parent | 941b567a41569260fef14a7337511e8f42337323 (diff) | |
tdf#131572 Add java 9 module info for unoloader.jar
Add a java module named "org.libreoffice.unoloader" for this jar.
Require this module from org.libreoffice.uno
(libreoffice.jar has unoloader.jar in its classpath,
so add the same dependency to the modules)
Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 42ca5cfc4910..cff4299bf06e 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -56,6 +56,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \ $(gb_JavaClassSet_JAVACDEBUG) \ -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ + --module-path "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ $(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ |