diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 13:11:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 15:06:40 +0000 |
commit | 5adc5d62a2f321707609f567590b0252ec4cff89 (patch) | |
tree | 25475e50b87610993c0387578afad24090830de3 | |
parent | 8cfda7206139b3017346c435591c77c9741ba8ee (diff) |
disable dynload expects services.rdb to list the orig library name
while ---enable-mergelibs creates a single libmergedlo.a in this
mode and the services.rdb contains that
I guess I could tweak cppuhelper/source/shlib.cxx and
solenv/bin/native-code.py etc to work differently or just take the
more well travelled road here
Change-Id: I35e2626824c9b015b5a6051db659fe467c35d8ba
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeOssFuzz.conf | 1 | ||||
-rw-r--r-- | vcl/commonfuzzer.mk | 47 |
3 files changed, 47 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 6acef411aa1e..0c067ba2b73a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -446,7 +446,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide)))) -fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi Library_clew Library_gie Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer endif # MAKE_RESTARTS diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf index 7caa28c683a5..11468f186337 100644 --- a/distro-configs/LibreOfficeOssFuzz.conf +++ b/distro-configs/LibreOfficeOssFuzz.conf @@ -1,7 +1,6 @@ --enable-fuzzers --disable-dynamic-loading --with-locales=en ---enable-mergelibs --disable-runtime-optimizations --disable-database-connectivity --disable-gui diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk index 481ea23bf865..abe36dd38989 100644 --- a/vcl/commonfuzzer.mk +++ b/vcl/commonfuzzer.mk @@ -36,7 +36,52 @@ fuzzer_externals = \ fuzzer_libraries = \ basctl \ - merged \ + avmedia \ + basegfx \ + canvastools \ + comphelper \ + configmgr \ + cppcanvas \ + dbtools \ + deployment \ + deploymentmisc \ + drawinglayer \ + editeng \ + filterconfig \ + fsstorage \ + fwe \ + fwi \ + fwk \ + i18npool \ + i18nutil \ + lng \ + localebe1 \ + mcnttype \ + msfilter \ + package2 \ + sax \ + sb \ + sfx \ + sofficeapp \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + ucb1 \ + ucbhelper \ + ucpexpand1 \ + ucpfile1 \ + unoxml \ + utl \ + uui \ + vcl \ + opencl \ + xmlscript \ + xo \ + xstor \ cui \ chartcontroller \ chartcore \ |