strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gb_CppunitTest__use_java_ure can be private again

Browse source 
...(which it already was until 1f6e670605 "gbuild:
require java UNO runtime explicitly"), as
2a87b3b5ae made that implicitly called from
gb_CppunitTest_use_jar(s), so its (sole outside) use in
postprocess/CppunitTest_services.mk is redundant

Change-Id: I9928521d184c54688de134ff3b9b5743ba3509c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88134
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2020-02-06 19:46:09 +01:00
parent 5090ee7e32
commit f3f5e11682
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
postprocess/CppunitTest_services.mk
View file

@ -43,8 +43,6 @@ endif
$(eval $(call gb_CppunitTest_use_configuration,services))
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_CppunitTest_use_java_ure,services))
$(eval $(call gb_CppunitTest_use_jars,services,\
ScriptProviderForJava \
smoketest \

4
solenv/gbuild/CppunitTest.mk
View file

@ -372,7 +372,7 @@ endif
endef
define gb_CppunitTest_use_java_ure
define gb_CppunitTest__use_java_ure
$(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) \
@ -389,7 +389,7 @@ $(call gb_CppunitTest_get_target,$(1)) : \
endef
define gb_CppunitTest_use_jar
$(call gb_CppunitTest_use_java_ure,$(1))
$(call gb_CppunitTest__use_java_ure,$(1))
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
endef