Snap for 9922347 from 10f46bb60b6f43eda35ef125145eaa2dfd583473 to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release

Change-Id: I3aaee6baeaab9c09036cba21f86421cc8c7ffcca

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"],
 }