diff --git a/libs/binder/fuzzer/Android.bp b/libs/binder/fuzzer/Android.bp
index d2f0d37..5a6955f 100644
--- a/libs/binder/fuzzer/Android.bp
+++ b/libs/binder/fuzzer/Android.bp
@@ -1,5 +1,5 @@
-cc_fuzz {
-    name: "binder_parcel_fuzzer",
+cc_defaults {
+    name: "binder_parcel_fuzzer_defaults",
     defaults: ["libbinder_ndk_host_user"],
     host_supported: true,
     srcs: [
@@ -36,4 +36,16 @@
             ],
         },
     },
+    defaults_visibility: [":__subpackages__"],
+}
+
+cc_fuzz {
+    name: "binder_parcel_fuzzer",
+    defaults: ["binder_parcel_fuzzer_defaults"],
+}
+
+cc_fuzz {
+    name: "binder_parcel_fuzzer_logs",
+    defaults: ["binder_parcel_fuzzer_defaults"],
+    cflags: ["-DENABLE_LOG_FUZZ"],
 }
diff --git a/libs/binder/fuzzer/util.h b/libs/binder/fuzzer/util.h
index a28cd1e..aa504d2 100644
--- a/libs/binder/fuzzer/util.h
+++ b/libs/binder/fuzzer/util.h
@@ -23,12 +23,9 @@
 #error "Must define FUZZ_LOG_TAG"
 #endif
 
-// for local debugging
-#define ENABLE_LOG_FUZZ 0
-
 #define FUZZ_LOG() FuzzLog(FUZZ_LOG_TAG).log()
 
-#if ENABLE_LOG_FUZZ == 1
+#ifdef ENABLE_LOG_FUZZ
 class FuzzLog {
 public:
     FuzzLog(const char* tag) : mTag(tag) {}