Skip to content

Commit 74cc684

Browse files
committed
Protobuf use existing deps
1 parent 7dee2fe commit 74cc684

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

fuzzing/libcommon/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ LOCAL_CPPFLAGS+=-I${R}/include/ -I/usr/local/include/libprotobuf-mutator -I/src/
1515
LOCAL_CXXFLAGS+=-g -Wall -Werror -pthread -Wno-deprecated-builtins
1616
LOCAL_LDFLAGS+=
1717
LOCAL_LIBADD+=$(LIB_FUZZING_ENGINE) -lssl -lcrypto ${R}/libcommon/libmosquitto_common.a -Wl,-Bstatic -largon2 -Wl,-Bdynamic
18-
PROTOBUF_LIBS=/usr/local/lib/libprotobuf-mutator-libfuzzer.a /usr/local/lib/libprotobuf-mutator.a /src/libprotobuf-mutator/external.protobuf/lib/libprotobufd.a
19-
PROTOC?=/src/libprotobuf-mutator/external.protobuf/bin/protoc
18+
PROTOBUF_LIBS=/usr/local/lib/libprotobuf-mutator-libfuzzer.a /usr/local/lib/libprotobuf-mutator.a -lprotobuf
19+
PROTOC?=protoc
2020

2121
all: $(FUZZERS)
2222

fuzzing/scripts/oss-fuzz-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cmake \
3434
-DCMAKE_C_COMPILER=clang \
3535
-DCMAKE_CXX_COMPILER=clang++ \
3636
-DCMAKE_BUILD_TYPE=Debug \
37-
-DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \
37+
-DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=OFF \
3838
-DLIB_PROTO_MUTATOR_EXAMPLES=OFF \
3939
-DLIB_PROTO_MUTATOR_TESTING=OFF \
4040
.

fuzzing/scripts/oss-fuzz-dependencies.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ apt-get update && apt-get install -y \
2525
libedit-dev \
2626
liblzma-dev \
2727
libmicrohttpd-dev \
28+
libprotobuf-dev \
2829
libsqlite3-dev \
2930
libtool-bin \
31+
protobuf-compiler \
3032
make
3133
git clone https://github.com/google/libprotobuf-mutator ${SRC}/libprotobuf-mutator
3234
git clone https://github.com/ralight/cJSON ${SRC}/cJSON

0 commit comments

Comments
 (0)