aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Aizatsky <aizatsky@google.com>2016-10-14 22:21:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-14 22:21:47 +0000
commitffd0d032094ca172e6ae12cffb16e860787e60db (patch)
tree7fcb8db143da1cea130b1c400ab021fe0fde2e1f
parenta4577bb304c7f32bd77a175ecdcf16d789b423f3 (diff)
parent088063a7b116e97aeef10fc6a8f7afaf9ccf88e9 (diff)
downloadtpm2-ffd0d032094ca172e6ae12cffb16e860787e60db.tar.gz
[oss-fuzz] updated Dockerfile to follow recent oss-fuzz infra changes am: 5e0c12af83 am: fbf8d37b7b am: 8b3d8e8bdc
am: 088063a7b1 Change-Id: I272f74652c9807010c6daca281636776f7801387
-rw-r--r--fuzz/Dockerfile3
-rwxr-xr-xfuzz/build.sh (renamed from fuzz/build-fuzzers.sh)2
2 files changed, 3 insertions, 2 deletions
diff --git a/fuzz/Dockerfile b/fuzz/Dockerfile
index f6dbefe..67aea85 100644
--- a/fuzz/Dockerfile
+++ b/fuzz/Dockerfile
@@ -6,4 +6,5 @@
#
FROM ossfuzz/base-libfuzzer
RUN apt-get install -y make libssl-dev binutils libgcc-5-dev
-CMD /src/tpm2/fuzz/build-fuzzers.sh
+ENV GIT_URL="https://chromium.googlesource.com/chromiumos/third_party/tpm2/"
+COPY fuzz/build.sh /src/
diff --git a/fuzz/build-fuzzers.sh b/fuzz/build.sh
index 3a2ab42..ae6ba1a 100755
--- a/fuzz/build-fuzzers.sh
+++ b/fuzz/build.sh
@@ -13,7 +13,7 @@ make V=1 obj=/work/tpm2 /work/tpm2/libtpm2.a
find /usr/lib -name "*.a"
grep -r BN_CTX_get /usr/lib/
-$CXX $CXXFLAGS $LDFLAGS -std=c++11 \
+$CXX $CXXFLAGS $FUZZER_LDFLAGS -std=c++11 \
/src/tpm2/fuzz/execute-command.cc -o /out/tpm2_execute_command_fuzzer \
/work/libfuzzer/*.o /work/tpm2/libtpm2.a \
/usr/lib/x86_64-linux-gnu/libcrypto.a /usr/lib/x86_64-linux-gnu/libssl.a \