unowinreg.dll is not in OOO layer

Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731

Repository.mk

@@ -449,6 +449,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	testtools_bridgetest \
 	testtools_constructors \
 	scqahelper \
+	unowinreg \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
@@ -612,7 +613,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	so_activex_x64 \
 	sysdtrans \
 	thidxmsi \
-	unowinreg \
 ))
 endif
 

odk/Package_unowinreg.mk

@@ -9,7 +9,7 @@
 
 ifeq ($(BUILD_UNOWINREG),YES)
 ifeq ($(COM),MSC)
-odk_unowinreg_DIR := $(OUTDIR)/bin
+odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library
 else
 odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
 endif