do not use gb_Helper_*native* functions

Change-Id: Iba3e4b97efe9dde7bb26e0e78ec7ec60ae642634

4 files changed, 8 insertions, 8 deletions

diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index c1f4317211d0..4452c8e51f02 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -47,7 +47,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
 $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
 	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	$(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Helper_abbreviate_dirs,\
 		echo "$(UNO_EXE)" \
 		"-ro $(OUTDIR)/xml/uno_services.rdb" \
 		"-ro $(OUTDIR)/bin/udkapi.rdb" \
@@ -60,13 +60,13 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
 ifneq ($(SOLAR_JAVA),)
 
 # how to do it more elegantly?
-MY_CLASSPATH := $(call gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/java_uno.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/jurt.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/juh.jar)
+MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
 # which other prerequisites do we need here?
 $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
 	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	$(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Helper_abbreviate_dirs,\
 		echo "java" \
 		"-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
 		"com.sun.star.comp.bridge.TestComponentMain" \
@@ -78,7 +78,7 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
 $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
 	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	$(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Helper_abbreviate_dirs,\
 		echo "JAVA_HOME=$(JAVA_HOME)" \
 		"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
 		"$(UNO_EXE)" \
@@ -98,7 +98,7 @@ endif
 $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
 	$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	$(call gb_Helper_abbreviate_dirs_native,\
+	$(call gb_Helper_abbreviate_dirs,\
 		echo "$(UNO_EXE)" \
 		"-ro $(OUTDIR)/xml/ure/services.rdb" \
 		"-ro $(OUTDIR)/xml/uno_services.rdb" \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index a54281d5a6be..87ee4f64d423 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -35,7 +35,7 @@ $(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
 		$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
 		$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
-	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_abbreviate_dirs, \
 	$(call gb_Helper_execute,climaker \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
 		--out $@ \
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 5e4110f67dd2..593cf169ea17 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(javamaker_
 $(javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
 	$(call gb_Executable_get_target_for_build,javamaker) | $(javamaker_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
-	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_abbreviate_dirs, \
 	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 0e76891e007f..89a8d274c94d 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -33,7 +33,7 @@ UNO_EXE := $(OUTDIR)/bin/uno
 $(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
 	$(UNO_EXE) \
 	$(call gb_InternalUnoApi_get_target,bridgetest)
-	$(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
+	$(call gb_Helper_abbreviate_dirs, $(UNO_EXE) \
 		-ro $(OUTDIR)/xml/uno_services.rdb \
 		-ro $(OUTDIR)/bin/udkapi.rdb \
 		-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \