1 files changed, 48 insertions, 18 deletions

diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 35dad5c9..ec26e0a8 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -18,18 +18,14 @@
  * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
  */
 
-cc_fuzz {
-    name: "opus_dec_fuzzer",
-    host_supported:true,
+cc_defaults {
+    name: "opus_fuzz_defaults",
+    host_supported: true,
 
     static_libs: [
         "libopus",
     ],
 
-    srcs: [
-        "opus_dec_fuzzer.cpp",
-    ],
-
     fuzz_config: {
         cc: [
             "android-media-fuzzing-reports@google.com",
@@ -39,23 +35,57 @@ cc_fuzz {
 }
 
 cc_fuzz {
-    name: "opus_multistream_dec_fuzzer",
-    host_supported:true,
+    name: "opus_dec_fuzzer",
 
-    static_libs: [
-        "libopus",
+    srcs: [
+        "opus_dec_fuzzer.cpp",
+    ],
+
+    defaults: [
+        "opus_fuzz_defaults",
     ],
+}
+
+cc_fuzz {
+    name: "opus_multistream_dec_fuzzer",
 
     srcs: [
         "opus_dec_fuzzer.cpp",
     ],
 
-    cflags: ["-DMULTISTREAM"],
+    cflags: [
+        "-DMULTISTREAM",
+    ],
 
-    fuzz_config: {
-        cc: [
-            "android-media-fuzzing-reports@google.com",
-        ],
-        componentid: 155276,
-    },
+    defaults: [
+        "opus_fuzz_defaults",
+    ],
+}
+
+cc_fuzz {
+    name: "opus_enc_fuzzer",
+
+    srcs: [
+        "opus_enc_fuzzer.cpp",
+    ],
+
+    defaults: [
+        "opus_fuzz_defaults"
+    ],
+}
+
+cc_fuzz {
+    name: "opus_multistream_enc_fuzzer",
+
+    srcs: [
+        "opus_enc_fuzzer.cpp",
+    ],
+
+    defaults: [
+        "opus_fuzz_defaults"
+    ],
+
+    cflags: [
+        "-DMULTISTREAM",
+    ],
 }