take out MSI CustomAction dlls from AutoInstall

BINARYTABLE, BINARYTABLE_ONLY flags were not handled

Change-Id: Ic6a0233e4f4213b9ea83a491949ab05c299a9201

Repository.mk

@@ -550,14 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		$(if $(DISABLE_ATL),,\
 			inprocserv \
 		) \
-		$(if $(WINDOWS_SDK_HOME),\
-			instooofiltmsi \
-			qslnkmsi \
-			reg4allmsdoc \
-			sdqsmsi \
-			sellangmsi \
-			sn_tools \
-		) \
 	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
@@ -579,16 +571,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	fop \
+	instooofiltmsi \
 	jfregca \
 	ooofilt \
 	ooofilt_x64 \
 	propertyhdl \
 	propertyhdl_x64 \
+	qslnkmsi \
+	reg4allmsdoc \
 	regactivex \
 	regpatchactivex \
+	sdqsmsi \
+	sellangmsi \
 	shlxthdl \
 	shlxthdl_x64 \
 	shlxtmsi \
+	sn_tools \
 	so_activex \
 	so_activex_x64 \
 	sysdtrans \

scp2/source/ooo/file_library_ooo.scp

@@ -504,3 +504,49 @@ File gid_File_Lib_Rdf
   #endif
 End
 #endif // SYSTEM_REDLAND
+
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_sn_tools
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
+    Dir = SCP2_OOO_LIB_DIR;
+    Name = "sn_tools.dll";
+End
+
+File gid_File_Lib_Reg4allmsdoc
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "reg4allmsdoc.dll";
+End
+
+File gid_File_Lib_Qslnkmsi
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "qslnkmsi.dll";
+End
+
+File gid_File_Lib_Sdqsmsi
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "sdqsmsi.dll";
+End
+
+File gid_File_Lib_Instooofiltmsi
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "instooofiltmsi.dll";
+End
+
+File gid_File_Lib_sellangmsi
+    LIB_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = gid_Brand_Dir_Program;
+    Name = "sellangmsi.dll";
+End
+
+#endif /* WNT && HAVE_WINDOWS_SDK */

scp2/source/ooo/module_hidden_ooo.scp

@@ -207,7 +207,12 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_I18n,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Dl,
+	gid_File_Lib_sn_tools,
     GID_FILE_LIB_WPD,
+	gid_File_Lib_Reg4allmsdoc,
+	gid_File_Lib_Qslnkmsi,
+	gid_File_Lib_Sdqsmsi,
+	gid_File_Lib_Instooofiltmsi,
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);