scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstall

Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4

Repository.mk

@@ -226,8 +226,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	acc \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
+	$(if $(filter MACOSX,$(OS)),\
+		$(if $(filter-out 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \
+		$(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \
+	) \
 	$(if $(DISABLE_SCRIPTING),,basctl) \
 	$(if $(DISABLE_SCRIPTING),,basprov) \
+	$(if $(filter $(OS),ANDROID),, \
+		basebmp \
+	) \
 	basegfx \
 	bib \
 	$(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
@@ -423,14 +430,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	adabas \
 	adabasui \
 	agg \
-	$(if $(filter $(OS),ANDROID),, \
-		basebmp \
-	) \
 	communi \
 	ooxml \
 	$(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \
-	avmediaMacAVF \
-	avmediaQuickTime \
 	filtertracer \
 	rpt \
 	rptui \

scp2/source/ooo/file_library_ooo.scp

@@ -92,35 +92,6 @@ End
 
 #endif
 
-#ifdef MACOSX
-
-#ifndef ENABLE_MACOSX_SANDBOX
-File gid_File_Lib_avmediaQuickTime
-	PACKED_LIB_FILE_BODY;
-	Name = LIBNAME(avmediaQuickTime);
-End
-#endif
-
-#if MAXOSX_SDK_VERSION >= 1070
-File gid_File_Lib_avmediaMacAVF
-	PACKED_LIB_FILE_BODY;
-	Name = LIBNAME(avmediaMacAVF);
-End
-#endif
-
-#endif
-
-#if defined(MACOSX)
-File gid_File_Lib_Basebmp
-    Name = LIBNAME(basebmp);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
-#endif
-
 #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
 //we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
 

scp2/source/ooo/module_hidden_ooo.scp

@@ -129,7 +129,6 @@ Module gid_Module_Root_Files_4
 	auto_ooobinarytable_ALL,
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
-	gid_File_Lib_BaseBmp,
 	gid_File_Lib_Zip);
 End