tdf#94698 cleanup Makefiles. Get rid of udkapi and offapi

This patch changes occurences in makefiles from $(eval $(call gb_CppunitTest_use_api,comphelper_test_config, \ udkapi \ offapi \ )) to $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test_config)) (corrected instead of abandon, jani) Change-Id: Ic96ec65d82d7452e288f05a8b6d576ef543b068e Reviewed-on: https://gerrit.libreoffice.org/23426 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
0 files changed, 0 insertions, 0 deletions
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index fdffba3b1f7d..3941a3e1ce52 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,basegfx))
 
 $(eval $(call gb_CppunitTest_use_external,basegfx,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,basegfx,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,basegfx))
 
 $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
     basegfx \
diff --git a/chart2/CppunitTest_chart2_common_functors.mk b/chart2/CppunitTest_chart2_common_functors.mk
index 46e58bc9967a..203de1d17b64 100644
--- a/chart2/CppunitTest_chart2_common_functors.mk
+++ b/chart2/CppunitTest_chart2_common_functors.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,chart2_common_functors,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_common_functors))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_common_functors))
 
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 51ce6b651300..50780b1095e3 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -64,10 +64,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_export,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,chart2_export,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_export))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_export))
 $(eval $(call gb_CppunitTest_use_vcl,chart2_export))
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index e101993e9eb4..a2263a840134 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -63,10 +63,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_import,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,chart2_import,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_import))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_import))
 $(eval $(call gb_CppunitTest_use_vcl,chart2_import))
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index 51872983b68f..9e6e2758cb74 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -63,10 +63,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,chart2_trendcalculators,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_trendcalculators))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_trendcalculators))
 $(eval $(call gb_CppunitTest_use_vcl,chart2_trendcalculators))
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index bb50d5b59608..92c26447f559 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -64,10 +64,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,chart2_xshape,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_xshape))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_xshape))
 $(eval $(call gb_CppunitTest_use_vcl,chart2_xshape))
diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
index 73ab199e625e..9dade8b53877 100644
--- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
+++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,comphelper_syntaxhighlight_test,\
 	boost_headers \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,comphelper_syntaxhighlight_test, \
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_syntaxhighlight_test))
 
 $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \
     comphelper \
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index 47843c6ba8ad..f67601e6a6de 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \
     comphelper/qa/container/testifcontainer \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,comphelper_test, \
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test))
 
 $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
     comphelper \
diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
index 21e8753f6605..58d490a5d64a 100644
--- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
+++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_variadictemplates_
     comphelper/qa/unit/variadictemplates \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,comphelper_variadictemplates_test, \
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_variadictemplates_test))
 
 $(eval $(call gb_CppunitTest_use_externals,comphelper_variadictemplates_test, \
 	boost_headers \
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index 316031485a05..ce2e2c2c5032 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\
 
 $(eval $(call gb_CppunitTest_use_external,connectivity_ado,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,connectivity_ado,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_ado))
 
 $(eval $(call gb_CppunitTest_use_ure,connectivity_ado))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_ado))
diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk
index f07601493871..be3b0413b8d1 100644
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_mork,\
 
 $(eval $(call gb_CppunitTest_use_external,connectivity_mork,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,connectivity_mork,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork))
 
 $(eval $(call gb_CppunitTest_use_ure,connectivity_mork))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_mork))
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index d4cc7c1add5d..e545e347f3d7 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
 
 $(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_emfplus))
 
 $(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
 $(eval $(call gb_CppunitTest_use_vcl_non_headless,cppcanvas_emfplus))
diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk
index 64f222cc8d24..2e3784263b2e 100644
--- a/cppcanvas/CppunitTest_cppcanvas_test.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_test.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,cppcanvas_test,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_test))
 
 $(eval $(call gb_CppunitTest_use_ure,cppcanvas_test))
 $(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 9ce2a03aa779..aed16db65eb9 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,desktop_lib,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,desktop_lib,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lib))
 
 $(eval $(call gb_CppunitTest_use_ure,desktop_lib))
 
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 354b9cfad092..121f4951e26e 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -51,9 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,editeng_borderline,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_borderline))
 
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index ea7f6896b52b..36fb35be49ff 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -52,10 +52,7 @@ $(eval $(call gb_CppunitTest_set_include,editeng_core,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,editeng_core,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_core))
 
 $(eval $(call gb_CppunitTest_use_ure,editeng_core))
 $(eval $(call gb_CppunitTest_use_vcl,editeng_core))
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index eafde6500641..0a1422d4b036 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -51,9 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,editeng_lookuptree,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_lookuptree))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index b6149b04a312..1d802522c65e 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -46,10 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,extensions_test_update,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,extensions_test_update))
 
 $(eval $(call gb_CppunitTest_use_ure,extensions_test_update))
 $(eval $(call gb_CppunitTest_use_vcl,extensions_test_update))
diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
index e8afc39bf266..362c89b6af75 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_dxf_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_dxf_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_dxf_test))
diff --git a/filter/CppunitTest_filter_eps_test.mk b/filter/CppunitTest_filter_eps_test.mk
index 300f9a707838..d49f10e05aeb 100644
--- a/filter/CppunitTest_filter_eps_test.mk
+++ b/filter/CppunitTest_filter_eps_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_eps_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_eps_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_eps_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_eps_test))
diff --git a/filter/CppunitTest_filter_met_test.mk b/filter/CppunitTest_filter_met_test.mk
index 64bbeb63782e..4a0027fdde36 100644
--- a/filter/CppunitTest_filter_met_test.mk
+++ b/filter/CppunitTest_filter_met_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_met_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_met_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_met_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_met_test))
diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk
index 2603d4800bbd..4d6406956aba 100644
--- a/filter/CppunitTest_filter_pcd_test.mk
+++ b/filter/CppunitTest_filter_pcd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pcd_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcd_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pcd_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pcd_test))
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk
index b44062aa0785..4a31c51f2d8c 100644
--- a/filter/CppunitTest_filter_pcx_test.mk
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcx_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pcx_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pcx_test))
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index fde0f54d8e82..7da6023b3850 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
     gie \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pict_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pict_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pict_test))
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
index e7879cad1cc9..5ccbde7df3de 100644
--- a/filter/CppunitTest_filter_ppm_test.mk
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test))
diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
index 2e4b03897f8f..503d1006e4e7 100644
--- a/filter/CppunitTest_filter_psd_test.mk
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_psd_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_psd_test))
diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk
index f6e5810b7f39..9265db9857ec 100644
--- a/filter/CppunitTest_filter_ras_test.mk
+++ b/filter/CppunitTest_filter_ras_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_ras_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ras_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ras_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_ras_test))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 51f17d3a6124..d62addca5bdd 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tga_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tga_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_tga_test))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 2aa9b806d499..d3dfdae4a7a5 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tiff_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tiff_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_tiff_test))
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index f205d80becb0..be1a8046dbb2 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -26,10 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,hwpfilter_test_hwpfilter))
 
 $(eval $(call gb_CppunitTest_use_ure,hwpfilter_test_hwpfilter))
 $(eval $(call gb_CppunitTest_use_vcl,hwpfilter_test_hwpfilter))
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index 076f59d51437..41993f9515b2 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18nlangtag_test_languagetag))
 
 $(eval $(call gb_CppunitTest_use_external,i18nlangtag_test_languagetag,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_api,i18nlangtag_test_languagetag,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18nlangtag_test_languagetag))
 
 $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\
 	i18nlangtag \
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index f264bc3e1744..3c91d25e6dab 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator))
 
 $(eval $(call gb_CppunitTest_use_external,i18npool_test_breakiterator,icu_headers))
 
-$(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_breakiterator))