[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk solenv/gbuild

[Stephan Bergmann (via logerrit)]

 postprocess/CppunitTest_services.mk |    2 --
 solenv/gbuild/CppunitTest.mk        |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f3f5e11682b0392b4e750ec014c399051a5fe27c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 6 19:46:09 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Feb 6 22:23:52 2020 +0100

    gb_CppunitTest__use_java_ure can be private again
    
    ...(which it already was until 1f6e670605cc856a6e9febb024f9cb2427156020 "gbuild:
    require java UNO runtime explicitly"), as
    2a87b3b5aed8296a7506374fd5324c5659a88cb5 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 at redhat.com>

diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk
index 9371443b5d6a..c0726f973da0 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -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 \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d914cf83faaa..1eb954c4242d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -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