[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac

[Caolán McNamara]

 bin/oss-fuzz-build.sh |    7 +++++--
 configure.ac          |    6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3b7054e0bb86cec2db08b7c7654710a21cf66a94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 9 10:24:22 2017 +0000

    use a different resource dir for oss-fuzz
    
    This reverts commit 754854674859560506b617ebf07e6563c197aac8.
    
    Change-Id: I0863fb5e34608911c784bbdf19e76297b3c2d13e

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 2c54e13..b0d3d6e 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -24,10 +24,13 @@ make fuzzers
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
 rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb
-pushd instdir/program
-cp -r *fuzzer *rc *rdb services types resource $OUT
+pushd instdir
+cp -r resource $OUT
+pushd program
+cp -r *fuzzer *rc *rdb services types $OUT
 mv $OUT/services/services.rdb $OUT/services.rdb
 popd
+popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
diff --git a/configure.ac b/configure.ac
index fb4441c..dd945c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3129,7 +3129,11 @@ else
     LIBO_SHARE_JAVA_FOLDER=program/classes
     LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_READMES_FOLDER=readmes
-    LIBO_SHARE_RESOURCE_FOLDER=program/resource
+    if test "$enable_fuzzers" != yes; then
+        LIBO_SHARE_RESOURCE_FOLDER=program/resource
+    else
+        LIBO_SHARE_RESOURCE_FOLDER=resource
+    fi
     LIBO_SHARE_SHELL_FOLDER=program/shell
     LIBO_URE_BIN_FOLDER=program
     LIBO_URE_ETC_FOLDER=program