Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352

Change-Id: I62a7760b3429a90ec3bb55a99a70a02a110ac6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 23 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 3c9ac24..3be6ff8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -360,9 +360,28 @@ cc_defaults {
 }
 
 cc_fuzz {
-    name: "zlib_uncompress_fuzzer",
+    name: "zlib_deflate_fuzzer",
     defaults: ["zlib_fuzz_defaults"],
-    srcs: ["contrib/tests/fuzzers/uncompress_fuzzer.cc"],
+    srcs: ["contrib/tests/fuzzers/deflate_fuzzer.cc"],
+}
+
+cc_fuzz {
+    name: "zlib_deflate_set_dictionary_fuzzer",
+    defaults: ["zlib_fuzz_defaults"],
+    srcs: ["contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc"],
+}
+
+cc_fuzz {
+    name: "zlib_inflate_fuzzer",
+    defaults: ["zlib_fuzz_defaults"],
+    srcs: ["contrib/tests/fuzzers/inflate_fuzzer.cc"],
+}
+
+cc_fuzz {
+    name: "zlib_inflate_with_header_fuzzer",
+    defaults: ["zlib_fuzz_defaults"],
+    srcs: ["contrib/tests/fuzzers/inflate_with_header_fuzzer.cc"],
+    enabled: false, // TODO: fix the third_party/zlib #include
 }
 
 cc_fuzz {
@@ -375,13 +394,7 @@ cc_fuzz {
 }
 
 cc_fuzz {
-    name: "zlib_deflate_set_dictionary_fuzzer",
-    defaults: ["zlib_fuzz_defaults"],
-    srcs: ["contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc"],
-}
-
-cc_fuzz {
-    name: "zlib_deflate_fuzzer",
+    name: "zlib_uncompress_fuzzer",
     defaults: ["zlib_fuzz_defaults"],
-    srcs: ["contrib/tests/fuzzers/deflate_fuzzer.cc"],
+    srcs: ["contrib/tests/fuzzers/uncompress_fuzzer.cc"],
 }