summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-03-26 15:04:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-05-06 14:48:21 +0200
commit35518c92365cc183ba6cce2a4d284a130c0ca13f (patch)
treef3de8bdec6331ce933126336cf701dcaffe9b662 /bridges
parent6bf3517d60272bdec878bb6dde92a47b45a3f866 (diff)
Move all public Java classes to libreoffice.jar
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/Jar_java_uno.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk
index ecaad3c4daa9..14be1adcc650 100644
--- a/bridges/Jar_java_uno.mk
+++ b/bridges/Jar_java_uno.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Jar_Jar,java_uno))
$(eval $(call gb_Jar_use_jars,java_uno,\
- jurt \
- ridl \
+ libreoffice \
))
$(eval $(call gb_Jar_set_manifest,java_uno,$(SRCDIR)/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest))
@@ -19,8 +18,7 @@ $(eval $(call gb_Jar_set_manifest,java_uno,$(SRCDIR)/bridges/source/jni_uno/java
$(eval $(call gb_Jar_set_packageroot,java_uno,com))
$(eval $(call gb_Jar_add_manifest_classpath,java_uno,\
- ridl.jar \
- jurt.jar \
+ libreoffice.jar \
$(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
))