diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-02 19:51:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 19:51:01 +0000 |
| commit | 75c8dcf71ca8652f671b4ca5fea780a558c86e08 (patch) | |
| tree | 328e6c9629b196cec1de3a94ee804d9fee3a0524 /projects/freeimage | |
| parent | 378a8d19d33a5a62afbbe33b7f7b87b67db47236 (diff) | |
| parent | 235e96b2f8ab4e43316158a2e6fa69e75a219e23 (diff) | |
| download | oss-fuzz-android12-qpr1-d-release.tar.gz | |
Upgrade oss-fuzz to 947169dc86572e121c3e138f366a9f39ac6266ae am: f3764d0712 am: 1117028736 am: 235e96b2f8android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/oss-fuzz/+/1662261
Change-Id: Ib7b7a79b38e1261c1d5fb4ccb1a5dfd106588996
Diffstat (limited to 'projects/freeimage')
| -rw-r--r-- | projects/freeimage/Dockerfile | 7 | ||||
| -rwxr-xr-x | projects/freeimage/build.sh | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/projects/freeimage/Dockerfile b/projects/freeimage/Dockerfile index 86ab661ac..3133e71a3 100644 --- a/projects/freeimage/Dockerfile +++ b/projects/freeimage/Dockerfile @@ -16,10 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool wget -# This downloads the latest version at the time of writing. There does not -# appear to be a head version of FreeImage. -RUN wget https://downloads.sourceforge.net/freeimage/FreeImage3180.zip -RUN unzip FreeImage3180.zip -WORKDIR $SRC +RUN svn checkout https://svn.code.sf.net/p/freeimage/svn/ freeimage-svn +WORKDIR $SRC/freeimage-svn/FreeImage/trunk/ COPY build.sh $SRC/ COPY load_from_memory_fuzzer.cc $SRC/ diff --git a/projects/freeimage/build.sh b/projects/freeimage/build.sh index a418bd0a3..707440eb2 100755 --- a/projects/freeimage/build.sh +++ b/projects/freeimage/build.sh @@ -15,15 +15,13 @@ # ################################################################################ -pushd FreeImage - # b44ExpLogTable.cpp only contains a definition of main(). sed -i 's/Source\/OpenEXR\/IlmImf\/b44ExpLogTable.cpp//' Makefile.srcs make LIBRARIES=-lc++ -j$(nproc) -popd +INSTALL_DIR="$PWD/Dist" -INSTALL_DIR=$SRC/FreeImage/Dist +cd $SRC $CXX $CXXFLAGS -I${INSTALL_DIR}/ $LIB_FUZZING_ENGINE \ load_from_memory_fuzzer.cc ${INSTALL_DIR}/libfreeimage.a \ |