Move org.libreoffice.embindtest from udkapi to offapi

...so it will be able to use e.g. css.task.XJob in its tests

Change-Id: I15e50c07ee4b1b315d2687dc7e7ea0c00ccc638c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165998
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>

9 files changed, 14 insertions, 16 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0ef13a1f7372..8e93cd59389f 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4438,6 +4438,19 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,org/freedesktop/PackageKit,\
     SyncDbusSessionHelper \
 ))
 
+ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,org/libreoffice/embindtest, \
+    Constants \
+    Enum \
+    Exception \
+    Struct \
+    XTest \
+))
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,org/libreoffice/embindtest, \
+    Test \
+))
+endif
+
 $(eval $(call gb_UnoApi_set_reference_rdbfile,offapi,$(call gb_UnoApiTarget_get_target,udkapi) $(SRCDIR)/offapi/type_reference/offapi.idl))
 
 # vim: set noet sw=4 ts=4:
diff --git a/udkapi/org/libreoffice/embindtest/Constants.idl b/offapi/org/libreoffice/embindtest/Constants.idl
index 06ecd22fb56d..06ecd22fb56d 100644
--- a/udkapi/org/libreoffice/embindtest/Constants.idl
+++ b/offapi/org/libreoffice/embindtest/Constants.idl
diff --git a/udkapi/org/libreoffice/embindtest/Enum.idl b/offapi/org/libreoffice/embindtest/Enum.idl
index 9056687aa0a6..9056687aa0a6 100644
--- a/udkapi/org/libreoffice/embindtest/Enum.idl
+++ b/offapi/org/libreoffice/embindtest/Enum.idl
diff --git a/udkapi/org/libreoffice/embindtest/Exception.idl b/offapi/org/libreoffice/embindtest/Exception.idl
index cc6e89d35df9..cc6e89d35df9 100644
--- a/udkapi/org/libreoffice/embindtest/Exception.idl
+++ b/offapi/org/libreoffice/embindtest/Exception.idl
diff --git a/udkapi/org/libreoffice/embindtest/Struct.idl b/offapi/org/libreoffice/embindtest/Struct.idl
index 6b9d36e40a1b..6b9d36e40a1b 100644
--- a/udkapi/org/libreoffice/embindtest/Struct.idl
+++ b/offapi/org/libreoffice/embindtest/Struct.idl
diff --git a/udkapi/org/libreoffice/embindtest/Test.idl b/offapi/org/libreoffice/embindtest/Test.idl
index ac7a1ece34f3..ac7a1ece34f3 100644
--- a/udkapi/org/libreoffice/embindtest/Test.idl
+++ b/offapi/org/libreoffice/embindtest/Test.idl
diff --git a/udkapi/org/libreoffice/embindtest/XTest.idl b/offapi/org/libreoffice/embindtest/XTest.idl
index b3b5237ce2b4..b3b5237ce2b4 100644
--- a/udkapi/org/libreoffice/embindtest/XTest.idl
+++ b/offapi/org/libreoffice/embindtest/XTest.idl
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 1e338c807e07..f18b9f758ddc 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -520,19 +520,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,com/sun/star/util,\
 	XVeto \
 ))
 
-ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,org/libreoffice/embindtest, \
-    Constants \
-    Enum \
-    Exception \
-    Struct \
-    XTest \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,org/libreoffice/embindtest, \
-    Test \
-))
-endif
-
 $(eval $(call gb_UnoApi_set_reference_rdbfile,udkapi,$(SRCDIR)/udkapi/type_reference/udkapi.idl))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/Library_embindtest.mk b/unotest/Library_embindtest.mk
index 8f53db5e52d0..b485bcd7ea83 100644
--- a/unotest/Library_embindtest.mk
+++ b/unotest/Library_embindtest.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_Library_add_exception_objects,embindtest, \
 
 $(eval $(call gb_Library_set_componentfile,embindtest,unotest/source/embindtest/embindtest,services))
 
-$(eval $(call gb_Library_use_api,embindtest, \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,embindtest))
 
 # vim: set noet sw=4 ts=4: