tdf#90753: Move brand packages to AutoInstall

gid_Brand_File_Bin_Soffice_Bin_Manifest was removed
in 26bddf3e80

Change-Id: Iff5314e8c3c6191556c082bc30938dd177b254fc

Repository.mk

@@ -836,6 +836,12 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
 	filter_xslt \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,brand,\
+	desktop_branding \
+	$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
+	$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
+))
+
 ifeq ($(USING_X11), TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,base_brand,\
 	desktop_sbase_sh \

scp2/InstallModule_ooo.mk

@@ -38,7 +38,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
 	$(if $(WINDOWS_SDK_HOME),\
 		-DHAVE_WINDOWS_SDK \
 	) \

scp2/source/ooo/common_brand.scp

@@ -56,11 +56,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Xdg);
     Files = (auto_brand_ALL,
              gid_Brand_File_Gdb_Trace,
-             gid_Brand_File_Bin_Soffice,
-             gid_Brand_File_Bin_Soffice_Bin_Manifest,
              gid_Brand_File_Bin_Unoinfo,
-             gid_Brand_File_Bmp_IntroAboutShell,
-             gid_Brand_File_Bmp_IntroAboutShell_custom,
 	     gid_Brand_File_Desktophelper_Txt,
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Lib_Dbghelp,
@@ -496,17 +492,6 @@ End
 
 #endif
 
-#if !defined MACOSX && !defined WNT
-
-File gid_Brand_File_Bin_Soffice
-    BIN_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_soffice_sh.filelist";
-    Styles = (FILELIST, PACKED);
-End
-
-#endif
-
 #ifdef WNT
 File gid_Brand_File_Desktophelper_Txt
     TXT_FILE_BODY;
@@ -535,22 +520,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-File gid_Brand_File_Bmp_IntroAboutShell
-    TXT_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_branding.filelist";
-    Styles = (FILELIST);
-End
-
-#if defined CUSTOM_BRANDING
-File gid_Brand_File_Bmp_IntroAboutShell_custom
-    TXT_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_branding_custom.filelist";
-    Styles = (FILELIST);
-End
-#endif
-
 File gid_Brand_File_Txt_Package
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Extensions;