diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-05 17:57:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-06 16:39:02 +0100 |
| commit | 3946711b03409909333bdb37d40b23a9ae9a34dc (patch) | |
| tree | 251066ea3862b20b907c90c0e949929c78062dcf /solenv | |
| parent | 3d22c0601455a78a5fdea6cf70b52156689bda4a (diff) | |
No more need to add unoil.jar to URE_MORE_JAVA_TYPES
...after ae855bf48163ff64d94cfc34aff8e37abdb5518d "tdf#117331 Merge jurt and
unoil into ridl"
Change-Id: Idf640b8c3bb9d8a19e26d494498b9902a75f4e64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88053
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 7aa8fdc9e5fb..1c74d216b625 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -86,8 +86,6 @@ $(if $(URE),\ "-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \ $(if $(strip $(UNO_SERVICES)),\ "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \ - $(if $(strip $(JAVA_URE)),\ - -env:URE_MORE_JAVA_TYPES=$(call gb_Helper_make_url,$(call gb_Jar_get_target,unoil))) \ -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER)) \ -env:LO_JAVA_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \ @@ -184,7 +182,6 @@ $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_ta $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_ilibfilename,$(1))) $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS := -$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : PYTHON_URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : VCL := $(false) @@ -376,7 +373,6 @@ endif endef define gb_CppunitTest_use_java_ure -$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(true) $(call gb_CppunitTest_get_target,$(1)) : \ $(foreach jar,java_uno juh ridl unoloader,$(call gb_Jar_get_target,$(jar))) \ $(call gb_Library_get_target,affine_uno_uno) \ |