diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2024-03-01 13:36:42 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-02 06:29:50 +0100 |
| commit | 4267c7124876b9213b3169a55731d260c8c63f7c (patch) | |
| tree | fc994b159c3b0f2c5e8502d696b6853a5423fb47 /ridljar | |
| parent | 1cd0d13e9bb0c30d0a472acd95da727c571d843b (diff) | |
Allow building with Java 8
Change-Id: Ib1af1a98993aabb8a03f4ef19d8da4d9a71fdbc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164226
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ridljar')
| -rw-r--r-- | ridljar/Jar_libreoffice.mk | 6 | ||||
| -rw-r--r-- | ridljar/Jar_unoloader.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk index 76a56eedc078..77397bc246ee 100644 --- a/ridljar/Jar_libreoffice.mk +++ b/ridljar/Jar_libreoffice.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ $(eval $(call gb_Jar_add_packagedirs,libreoffice,\ $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ - $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \ + $(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \ )) -$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ ridljar/source/libreoffice/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk index 2acf20b5b289..b7fcbc105dc1 100644 --- a/ridljar/Jar_unoloader.mk +++ b/ridljar/Jar_unoloader.mk @@ -14,13 +14,13 @@ $(eval $(call gb_Jar_set_packageroot,unoloader,com)) $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) # the module-info.class is manually added here since it's not in "com" dir -$(eval $(call gb_Jar_add_packagedirs,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_packagedirs,unoloader,\ $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ -)) +))) -$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ ridljar/source/unoloader/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ |