refactor fuzzer army a bit

the core lib has grown sufficiently large that the fuzzing tooling
complains of too many instrumented conditions so split things
up to hopefully fit again

Change-Id: I58899d143925f958aec95b5f213c2dc75a6686ec
Reviewed-on: https://gerrit.libreoffice.org/38647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

41 files changed, 294 insertions, 95 deletions

diff --git a/vcl/CustomTarget_nativecode.mk b/vcl/CustomTarget_nativecalc.mk
index 65c0f6a15021..1c6804082a2f 100644
--- a/vcl/CustomTarget_nativecode.mk
+++ b/vcl/CustomTarget_nativecalc.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
 
 fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
 
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-code.cxx
+fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-calc.cxx
 
 $(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
-	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g draw -g writer -g calc) > $@
+	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g calc) > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativecore.mk b/vcl/CustomTarget_nativecore.mk
new file mode 100644
index 000000000000..964e7af1a8d3
--- /dev/null
+++ b/vcl/CustomTarget_nativecore.mk
@@ -0,0 +1,18 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
+
+fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
+
+fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-core.cxx
+
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativedraw.mk b/vcl/CustomTarget_nativedraw.mk
new file mode 100644
index 000000000000..513bf564b909
--- /dev/null
+++ b/vcl/CustomTarget_nativedraw.mk
@@ -0,0 +1,18 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
+
+fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
+
+fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-draw.cxx
+
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g draw) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativewriter.mk b/vcl/CustomTarget_nativewriter.mk
new file mode 100644
index 000000000000..c396f0f5df2b
--- /dev/null
+++ b/vcl/CustomTarget_nativewriter.mk
@@ -0,0 +1,18 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
+
+fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
+
+fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-writer.cxx
+
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+	$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g writer) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Executable_602fuzzer.mk b/vcl/Executable_602fuzzer.mk
index dfa5ef0a253c..fdc553ce8ac7 100644
--- a/vcl/Executable_602fuzzer.mk
+++ b/vcl/Executable_602fuzzer.mk
@@ -27,14 +27,15 @@ $(eval $(call gb_Executable_set_include,602fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,602fuzzer,\
-	t602filter \
-	$(fuzzer_libraries) \
+    t602filter \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,602fuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,602fuzzer,\
diff --git a/vcl/Executable_bmpfuzzer.mk b/vcl/Executable_bmpfuzzer.mk
index bfa7fb375595..2b125ee66375 100644
--- a/vcl/Executable_bmpfuzzer.mk
+++ b/vcl/Executable_bmpfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,bmpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,bmpfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,bmpfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\
diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk
index 4b7a5a772bbc..30ea776f4691 100644
--- a/vcl/Executable_cgmfuzzer.mk
+++ b/vcl/Executable_cgmfuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,cgmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,cgmfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_draw_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cgmfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_draw \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,cgmfuzzer,\
diff --git a/vcl/Executable_dxffuzzer.mk b/vcl/Executable_dxffuzzer.mk
index 059ebd3aaf1e..1b78cfb4f598 100644
--- a/vcl/Executable_dxffuzzer.mk
+++ b/vcl/Executable_dxffuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,dxffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,dxffuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,dxffuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,dxffuzzer,\
diff --git a/vcl/Executable_epsfuzzer.mk b/vcl/Executable_epsfuzzer.mk
index 445bfc46b0d3..cc5c3a483bbc 100644
--- a/vcl/Executable_epsfuzzer.mk
+++ b/vcl/Executable_epsfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,epsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,epsfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,epsfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,epsfuzzer,\
diff --git a/vcl/Executable_giffuzzer.mk b/vcl/Executable_giffuzzer.mk
index 132b445aab2b..455e22bccdba 100644
--- a/vcl/Executable_giffuzzer.mk
+++ b/vcl/Executable_giffuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,giffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,giffuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,giffuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,giffuzzer,\
diff --git a/vcl/Executable_hwpfuzzer.mk b/vcl/Executable_hwpfuzzer.mk
index db55ad3ac8da..8e86a966fb04 100644
--- a/vcl/Executable_hwpfuzzer.mk
+++ b/vcl/Executable_hwpfuzzer.mk
@@ -27,14 +27,15 @@ $(eval $(call gb_Executable_set_include,hwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,hwpfuzzer,\
-	hwp \
-	$(fuzzer_libraries) \
+    hwp \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,hwpfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,hwpfuzzer,\
diff --git a/vcl/Executable_jpgfuzzer.mk b/vcl/Executable_jpgfuzzer.mk
index d077dce4b195..ab5f09056b31 100644
--- a/vcl/Executable_jpgfuzzer.mk
+++ b/vcl/Executable_jpgfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,jpgfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,jpgfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,jpgfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,jpgfuzzer,\
diff --git a/vcl/Executable_lwpfuzzer.mk b/vcl/Executable_lwpfuzzer.mk
index 46c2867502de..dcf48e4a26b1 100644
--- a/vcl/Executable_lwpfuzzer.mk
+++ b/vcl/Executable_lwpfuzzer.mk
@@ -27,14 +27,15 @@ $(eval $(call gb_Executable_set_include,lwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,lwpfuzzer,\
-	lwpft \
-	$(fuzzer_libraries) \
+    lwpft \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,lwpfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,lwpfuzzer,\
diff --git a/vcl/Executable_metfuzzer.mk b/vcl/Executable_metfuzzer.mk
index 2377f753cce8..5234bda2fa69 100644
--- a/vcl/Executable_metfuzzer.mk
+++ b/vcl/Executable_metfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,metfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,metfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,metfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,metfuzzer,\
diff --git a/vcl/Executable_olefuzzer.mk b/vcl/Executable_olefuzzer.mk
index d339f4cc80a6..1fc064876027 100644
--- a/vcl/Executable_olefuzzer.mk
+++ b/vcl/Executable_olefuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,olefuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,olefuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,olefuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,olefuzzer,\
diff --git a/vcl/Executable_pcdfuzzer.mk b/vcl/Executable_pcdfuzzer.mk
index 0df86ddd6ad9..f115af391a1f 100644
--- a/vcl/Executable_pcdfuzzer.mk
+++ b/vcl/Executable_pcdfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,pcdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pcdfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcdfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcdfuzzer,\
diff --git a/vcl/Executable_pctfuzzer.mk b/vcl/Executable_pctfuzzer.mk
index 670a7fe3d3e8..17c8c61233d4 100644
--- a/vcl/Executable_pctfuzzer.mk
+++ b/vcl/Executable_pctfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,pctfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pctfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pctfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pctfuzzer,\
diff --git a/vcl/Executable_pcxfuzzer.mk b/vcl/Executable_pcxfuzzer.mk
index ef89945c7d93..ad24b39a30a9 100644
--- a/vcl/Executable_pcxfuzzer.mk
+++ b/vcl/Executable_pcxfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,pcxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pcxfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcxfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcxfuzzer,\
diff --git a/vcl/Executable_pngfuzzer.mk b/vcl/Executable_pngfuzzer.mk
index 8e6519c1db50..b58b3f1eb4f9 100644
--- a/vcl/Executable_pngfuzzer.mk
+++ b/vcl/Executable_pngfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,pngfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pngfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pngfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pngfuzzer,\
diff --git a/vcl/Executable_ppmfuzzer.mk b/vcl/Executable_ppmfuzzer.mk
index 07b87a29d4c0..ee70e598f098 100644
--- a/vcl/Executable_ppmfuzzer.mk
+++ b/vcl/Executable_ppmfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,ppmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,ppmfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ppmfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ppmfuzzer,\
diff --git a/vcl/Executable_pptfuzzer.mk b/vcl/Executable_pptfuzzer.mk
index fc3cca2eb7c8..395dcf5b04b2 100644
--- a/vcl/Executable_pptfuzzer.mk
+++ b/vcl/Executable_pptfuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,pptfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pptfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_draw_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pptfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_draw \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pptfuzzer,\
diff --git a/vcl/Executable_psdfuzzer.mk b/vcl/Executable_psdfuzzer.mk
index d9dc4531d5c8..4ed652ae2831 100644
--- a/vcl/Executable_psdfuzzer.mk
+++ b/vcl/Executable_psdfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,psdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,psdfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,psdfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,psdfuzzer,\
diff --git a/vcl/Executable_qpwfuzzer.mk b/vcl/Executable_qpwfuzzer.mk
index 7611f5c17757..158743722fbd 100644
--- a/vcl/Executable_qpwfuzzer.mk
+++ b/vcl/Executable_qpwfuzzer.mk
@@ -27,14 +27,15 @@ $(eval $(call gb_Executable_set_include,qpwfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,qpwfuzzer,\
-	scfilt \
-	$(fuzzer_libraries) \
+    $(fuzzer_calc_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,qpwfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_calc \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,qpwfuzzer,\
diff --git a/vcl/Executable_rasfuzzer.mk b/vcl/Executable_rasfuzzer.mk
index cf62bb03eac4..60bc69085688 100644
--- a/vcl/Executable_rasfuzzer.mk
+++ b/vcl/Executable_rasfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,rasfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,rasfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rasfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rasfuzzer,\
diff --git a/vcl/Executable_rtffuzzer.mk b/vcl/Executable_rtffuzzer.mk
index 38b64a179f27..2e7a3429e365 100644
--- a/vcl/Executable_rtffuzzer.mk
+++ b/vcl/Executable_rtffuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,rtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,rtffuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_writer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rtffuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_writer \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rtffuzzer,\
diff --git a/vcl/Executable_svmfuzzer.mk b/vcl/Executable_svmfuzzer.mk
index d9a009c27537..e43b3bfd6659 100644
--- a/vcl/Executable_svmfuzzer.mk
+++ b/vcl/Executable_svmfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,svmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,svmfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,svmfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,svmfuzzer,\
diff --git a/vcl/Executable_tgafuzzer.mk b/vcl/Executable_tgafuzzer.mk
index 6ba8d3991f64..e9c3c5d2117c 100644
--- a/vcl/Executable_tgafuzzer.mk
+++ b/vcl/Executable_tgafuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,tgafuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,tgafuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tgafuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tgafuzzer,\
diff --git a/vcl/Executable_tiffuzzer.mk b/vcl/Executable_tiffuzzer.mk
index 91ebb96b2947..7989eed93c23 100644
--- a/vcl/Executable_tiffuzzer.mk
+++ b/vcl/Executable_tiffuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,tiffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,tiffuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tiffuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tiffuzzer,\
diff --git a/vcl/Executable_wmffuzzer.mk b/vcl/Executable_wmffuzzer.mk
index 22feb6a40e55..bfebcfb9f394 100644
--- a/vcl/Executable_wmffuzzer.mk
+++ b/vcl/Executable_wmffuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,wmffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,wmffuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,wmffuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,wmffuzzer,\
diff --git a/vcl/Executable_ww2fuzzer.mk b/vcl/Executable_ww2fuzzer.mk
index 2a0a19d6fbf8..02acbdfc64ea 100644
--- a/vcl/Executable_ww2fuzzer.mk
+++ b/vcl/Executable_ww2fuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,ww2fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,ww2fuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_writer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww2fuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_writer \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww2fuzzer,\
diff --git a/vcl/Executable_ww6fuzzer.mk b/vcl/Executable_ww6fuzzer.mk
index 09f3ec46c870..4318ba663642 100644
--- a/vcl/Executable_ww6fuzzer.mk
+++ b/vcl/Executable_ww6fuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,ww6fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,ww6fuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_writer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww6fuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_writer \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww6fuzzer,\
diff --git a/vcl/Executable_ww8fuzzer.mk b/vcl/Executable_ww8fuzzer.mk
index 41ce144e6c52..da811cc0b231 100644
--- a/vcl/Executable_ww8fuzzer.mk
+++ b/vcl/Executable_ww8fuzzer.mk
@@ -27,13 +27,15 @@ $(eval $(call gb_Executable_set_include,ww8fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,ww8fuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_writer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww8fuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_writer \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww8fuzzer,\
diff --git a/vcl/Executable_xbmfuzzer.mk b/vcl/Executable_xbmfuzzer.mk
index 615d0672ae3a..42deb02862e5 100644
--- a/vcl/Executable_xbmfuzzer.mk
+++ b/vcl/Executable_xbmfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,xbmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,xbmfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xbmfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xbmfuzzer,\
diff --git a/vcl/Executable_xpmfuzzer.mk b/vcl/Executable_xpmfuzzer.mk
index 910654aa84eb..0118213ee05a 100644
--- a/vcl/Executable_xpmfuzzer.mk
+++ b/vcl/Executable_xpmfuzzer.mk
@@ -27,13 +27,14 @@ $(eval $(call gb_Executable_set_include,xpmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,xpmfuzzer,\
-	$(fuzzer_libraries) \
+    $(fuzzer_core_libraries) \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xpmfuzzer,\
     findsofficepath \
     ulingu \
-    fuzzer \
+    fuzzer_core \
+    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xpmfuzzer,\
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index cf89ec28d019..c7d225b83a48 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -104,8 +104,15 @@ endif
 
 ifneq ($(ENABLE_FUZZERS),)
 $(eval $(call gb_Module_add_targets,vcl,\
-    CustomTarget_nativecode \
-    StaticLibrary_fuzzer \
+    CustomTarget_nativecore \
+    CustomTarget_nativecalc \
+    CustomTarget_nativedraw \
+    CustomTarget_nativewriter \
+    StaticLibrary_fuzzerstubs \
+    StaticLibrary_fuzzer_core \
+    StaticLibrary_fuzzer_calc \
+    StaticLibrary_fuzzer_draw \
+    StaticLibrary_fuzzer_writer \
     Executable_wmffuzzer \
     Executable_jpgfuzzer \
     Executable_giffuzzer \
diff --git a/vcl/StaticLibrary_fuzzer_calc.mk b/vcl/StaticLibrary_fuzzer_calc.mk
new file mode 100644
index 000000000000..5bb543f566a3
--- /dev/null
+++ b/vcl/StaticLibrary_fuzzer_calc.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer_calc))
+
+$(eval $(call gb_StaticLibrary_set_include,fuzzer_calc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,fuzzer_calc,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer_calc,\
+    CustomTarget/vcl/workben/native-calc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/StaticLibrary_fuzzer_core.mk b/vcl/StaticLibrary_fuzzer_core.mk
new file mode 100644
index 000000000000..6fa58b10b433
--- /dev/null
+++ b/vcl/StaticLibrary_fuzzer_core.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer_core))
+
+$(eval $(call gb_StaticLibrary_set_include,fuzzer_core,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,fuzzer_core,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer_core,\
+    CustomTarget/vcl/workben/native-core \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/StaticLibrary_fuzzer_draw.mk b/vcl/StaticLibrary_fuzzer_draw.mk
new file mode 100644
index 000000000000..69c2cd5ab646
--- /dev/null
+++ b/vcl/StaticLibrary_fuzzer_draw.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer_draw))
+
+$(eval $(call gb_StaticLibrary_set_include,fuzzer_draw,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,fuzzer_draw,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer_draw,\
+    CustomTarget/vcl/workben/native-draw \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/StaticLibrary_fuzzer_writer.mk b/vcl/StaticLibrary_fuzzer_writer.mk
new file mode 100644
index 000000000000..91765353fa3c
--- /dev/null
+++ b/vcl/StaticLibrary_fuzzer_writer.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer_writer))
+
+$(eval $(call gb_StaticLibrary_set_include,fuzzer_writer,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,fuzzer_writer,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer_writer,\
+    CustomTarget/vcl/workben/native-writer \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/StaticLibrary_fuzzer.mk b/vcl/StaticLibrary_fuzzerstubs.mk
index 1b712ea539c1..3c9109dfe1bd 100644
--- a/vcl/StaticLibrary_fuzzer.mk
+++ b/vcl/StaticLibrary_fuzzerstubs.mk
@@ -6,19 +6,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer))
+$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzerstubs))
 
-$(eval $(call gb_StaticLibrary_set_include,fuzzer,\
+$(eval $(call gb_StaticLibrary_set_include,fuzzerstubs,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
 ))
 
-$(eval $(call gb_StaticLibrary_use_api,fuzzer,\
+$(eval $(call gb_StaticLibrary_use_api,fuzzerstubs,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,fuzzer,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,fuzzerstubs,\
     vcl/workben/localestub/localestub \
     vcl/workben/localestub/localedata_en_AU \
     vcl/workben/localestub/localedata_en_BW \
@@ -41,8 +41,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,fuzzer,\
     vcl/workben/localestub/localedata_en_ZW \
 ))
 
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer,\
-    CustomTarget/vcl/workben/native-code \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 235bfc797fd5..4575453399f6 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -39,23 +39,7 @@ fuzzer_externals = \
     hunspell \
     zlib \
 
-fuzzer_libraries = \
-    msword \
-    sw \
-    swd \
-    writerfilter \
-    textfd \
-    analysis \
-    date \
-    pricing \
-    scfilt \
-    scd \
-    vbaevents \
-    sc \
-    sdfilt \
-    sd \
-    sdd \
-    icg \
+fuzzer_core_libraries = \
     basctl \
     avmedia \
     basegfx \
@@ -69,8 +53,6 @@ fuzzer_libraries = \
     drawinglayer \
     editeng \
     filterconfig \
-    for \
-    forui \
     fsstorage \
     fwe \
     fwi \
@@ -149,3 +131,27 @@ fuzzer_libraries = \
     gcc3_uno \
     salhelper \
     sal \
+
+fuzzer_calc_libraries = \
+    analysis \
+    date \
+    pricing \
+    scfilt \
+    scd \
+    vbaevents \
+    sc \
+    for \
+    forui \
+
+fuzzer_writer_libraries = \
+    msword \
+    sw \
+    swd \
+    writerfilter \
+    textfd \
+
+fuzzer_draw_libraries = \
+    sdfilt \
+    sd \
+    sdd \
+    icg \