oss-fuzz: convert to static cross-build

This way we can get rid of the pre-generated locale data and the
special fuzzers target, which invokes a full gbuild make for
every prereqisite, always parsing the whole tree, taking ages.

This also reverts:
- commit d0780b21cfe235c4446adf649eb690f9c1771dd5 ("fix oss-fuzz
  build") by adding epubgen and revenge dependencies.
- commit ff25d6a123beb42476bf42d189b3033a86835b2a ("ofz#41602 fix
  more build failure"), which shouldn't happen anymore since
  commit d47628f287f4377394c4ff488c433bfe254b6abe ("don't want to
  link to system static libs for DISABLE_DYNLOADING")

Change-Id: I3aed9ec62da507254b42e4e7470bae1097b4bc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127031
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

8 files changed, 11 insertions, 16 deletions

diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index fbacbe92fd98..57bc9020713b 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_api,docxfuzzer,\
 
 $(eval $(call gb_Executable_use_externals,docxfuzzer,\
     $(fuzzer_externals) \
+    epubgen \
+    revenge \
 ))
 
 $(eval $(call gb_Executable_set_include,docxfuzzer,\
diff --git a/vcl/Executable_fodtfuzzer.mk b/vcl/Executable_fodtfuzzer.mk
index 94a15362cbd4..f07a002f8fcf 100644
--- a/vcl/Executable_fodtfuzzer.mk
+++ b/vcl/Executable_fodtfuzzer.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_api,fodtfuzzer,\
 
 $(eval $(call gb_Executable_use_externals,fodtfuzzer,\
     $(fuzzer_externals) \
+    epubgen \
+    revenge \
 ))
 
 $(eval $(call gb_Executable_set_include,fodtfuzzer,\
diff --git a/vcl/Executable_htmlfuzzer.mk b/vcl/Executable_htmlfuzzer.mk
index 33a567a4c417..fc42be8584bc 100644
--- a/vcl/Executable_htmlfuzzer.mk
+++ b/vcl/Executable_htmlfuzzer.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_Executable_use_api,htmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_externals,htmlfuzzer,\
-	$(fuzzer_externals) \
+    $(fuzzer_externals) \
+    epubgen \
+    revenge \
 ))
 
 $(eval $(call gb_Executable_set_include,htmlfuzzer,\
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 879bfd5afa05..b1cfb2c5b2cd 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
         Package_opengl_denylist ) \
     $(if $(filter SKIA,$(BUILD_TYPE)), \
         Package_skia_denylist ) \
-    $(if $(filter DESKTOP,$(BUILD_TYPE)), \
+    $(if $(filter DESKTOP FUZZERS,$(BUILD_TYPE)), \
         StaticLibrary_vclmain \
         $(if $(DISABLE_GUI),, \
             $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
@@ -151,7 +151,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
     CustomTarget_nativedraw \
     CustomTarget_nativewriter \
     CustomTarget_nativemath \
-    StaticLibrary_fuzzerstubs \
     StaticLibrary_fuzzer_core \
     StaticLibrary_fuzzer_calc \
     StaticLibrary_fuzzer_draw \
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 968bb6e8eb75..07f5c4c47591 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -44,7 +44,6 @@ fuzzer_externals = \
 
 fuzzer_statics = \
      findsofficepath \
-     fuzzerstubs \
      ulingu \
 
 fuzzer_core_libraries = \
@@ -150,6 +149,9 @@ fuzzer_core_libraries = \
     gcc3_uno \
     salhelper \
     sal \
+    index_data \
+    localedata_en \
+    localedata_others \
 
 fuzzer_calc_libraries = \
     analysis \
diff --git a/vcl/workben/docxfuzzer.cxx b/vcl/workben/docxfuzzer.cxx
index 4e116c6002cf..73fc198bd886 100644
--- a/vcl/workben/docxfuzzer.cxx
+++ b/vcl/workben/docxfuzzer.cxx
@@ -16,11 +16,6 @@ extern "C" void* SwCreateDialogFactory()
     return nullptr;
 }
 
-extern "C" void* com_sun_star_comp_Writer_EPUBExportFilter_get_implementation()
-{
-    return nullptr;
-}
-
 extern "C" bool TestImportDOCX(SvStream &rStream);
 
 extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
diff --git a/vcl/workben/fodtfuzzer.cxx b/vcl/workben/fodtfuzzer.cxx
index 54ae26622b7b..71c37aa7c42d 100644
--- a/vcl/workben/fodtfuzzer.cxx
+++ b/vcl/workben/fodtfuzzer.cxx
@@ -16,11 +16,6 @@ extern "C" void* SwCreateDialogFactory()
     return nullptr;
 }
 
-extern "C" void* com_sun_star_comp_Writer_EPUBExportFilter_get_implementation()
-{
-    return nullptr;
-}
-
 extern "C" bool TestImportFODT(SvStream &rStream);
 
 extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
diff --git a/vcl/workben/htmlfuzzer.cxx b/vcl/workben/htmlfuzzer.cxx
index 6da6c853f3bb..b2e89442088b 100644
--- a/vcl/workben/htmlfuzzer.cxx
+++ b/vcl/workben/htmlfuzzer.cxx
@@ -13,8 +13,6 @@
 
 extern "C" void* SwCreateDialogFactory() { return nullptr; }
 
-extern "C" void* com_sun_star_comp_Writer_EPUBExportFilter_get_implementation() { return nullptr; }
-
 extern "C" bool TestImportHTML(SvStream& rStream);
 
 extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)