diff options
author | Elliott Hughes <enh@google.com> | 2023-04-11 20:03:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-11 20:03:00 +0000 |
commit | 10f46bb60b6f43eda35ef125145eaa2dfd583473 (patch) | |
tree | 3b2f451c095dda0f9783e6ec0c7a3f502b4224be | |
parent | 6cccd7766871cbfdb06a9a82ea9c16f944e43c25 (diff) | |
parent | b6f3ad40eaa08fa7a52173598f7f9c2d3cf55771 (diff) | |
download | zlib-10f46bb60b6f43eda35ef125145eaa2dfd583473.tar.gz |
Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: fa55db7eaa am: b6f3ad40eaandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352
Change-Id: I1c24e6c253f97781f063b2ecc769135b89c9a3ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 33 |
1 files changed, 23 insertions, 10 deletions
@@ -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"], } |