gbuild: add customtarget dependencies for java stuff

solenv/gbuild/Jar.mk

@@ -201,13 +201,23 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
 
 endef
 
+define gb_Jar_add_customtarget_dependency
+$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
+endef
+
+define gb_Jar_add_customtarget_dependencies
+$(foreach customtarget,$(2),$(call gb_Jar_add_customtarget_dependency,$(1),$(customtarget)))
+
+endef
+
 define gb_Jar_add_package_dependency
 $(call gb_JavaClassSet_add_package_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2))
 
 endef
 
 define gb_Jar_add_package_dependencies
-$(call gb_JavaClassSet_add_package_dependencies,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(foreach package,$(2),$(call gb_Jar_add_package_dependency,$(1),$(package)))
 
 endef
 

solenv/gbuild/JavaClassSet.mk

@@ -159,14 +159,15 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
 
 endef
 
-define gb_JavaClassSet_add_package_dependency
+define gb_JavaClassSet_add_customtarget_dependency
 $(call gb_JavaClassSet_get_preparation_target,$(1)) : \
-	$(call gb_Package_get_target,$(2))
+	$(call gb_CustomTarget_get_target,$(2))
 
 endef
 
-define gb_JavaClassSet_add_package_dependencies
-$(foreach dependency,$(2),$(call gb_JavaClassSet_add_package_dependency,$(1),$(dependency)))
+define gb_JavaClassSet_add_package_dependency
+$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
+	$(call gb_Package_get_target,$(2))
 
 endef
 

solenv/gbuild/JunitTest.mk

@@ -124,13 +124,23 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call
 
 endef
 
+define gb_JunitTest_add_customtarget_dependency
+$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+
+endef
+
+define gb_JunitTest_add_customtarget_dependencies
+$(foreach dependency,$(2),$(call gb_JunitTest_add_customtarget_dependency,$(1),$(dependency)))
+
+endef
+
 define gb_JunitTest_add_package_dependency
 $(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
 
 endef
 
 define gb_JunitTest_add_package_dependencies
-$(call gb_JavaClassSet_add_package_dependencies,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+$(foreach dependency,$(2),$(call gb_JunitTest_add_package_dependency,$(1),$(dependency)))
 
 endef
 
@@ -152,6 +162,9 @@ gb_JunitTest_add_sourcefile :=
 gb_JunitTest_add_sourcefiles :=
 gb_JunitTest_add_jar :=
 gb_JunitTest_add_jars :=
+gb_JunitTest_add_jar_classset :=
+gb_JunitTest_add_customtarget_dependency :=
+gb_JunitTest_add_customtarget_dependencies :=
 gb_JunitTest_add_package_dependency :=
 gb_JunitTest_add_package_dependencies :=