assimp: fix build. (#5560)

projects/assimp/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2019 Google Inc.
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

projects/assimp/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -eu
-# Copyright 2019 Google Inc.
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 ################################################################################
 
 # generate build env and build assimp
-cmake CMakeLists.txt -G "Ninja" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_SAMPLES=OFF
+cmake CMakeLists.txt -G "Ninja" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ZLIB=ON \
+                                -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
+                                -DASSIMP_BUILD_SAMPLES=OFF
 cmake --build .
 
-# build the fuzzer
-$CXX $CXXFLAGS -std=c++11 -I$SRC/assimp/include \
-	fuzz/assimp_fuzzer.cc -o $OUT/assimp_fuzzer \
-	$LIB_FUZZING_ENGINE $SRC/assimp/lib/libassimp.a $SRC/assimp/lib/libIrrXML.a $SRC/assimp/lib/libzlibstatic.a
+# Build the fuzzer
+$CXX $CXXFLAGS $LIB_FUZZING_ENGINE -std=c++11 -I$SRC/assimp/include \
+		fuzz/assimp_fuzzer.cc -o $OUT/assimp_fuzzer  \
+		./lib/libassimp.a ./contrib/zlib/libzlibstatic.a

projects/assimp/project_proposed.yaml

@@ -1,10 +0,0 @@
-homepage: "https://github.com/assimp/assimp"
-primary_contact: "kim.kulling@googlemail.com"
-auto_ccs:
-  - "kientzle@gmail.com"
-  - "martin@matuska.org"
-sanitizers:
-  - address
-  - memory:
-     experimental: True
-  - undefined