diff --git a/health/aidl/default/Android.bp b/health/aidl/default/Android.bp index 0d426dada4..4eb3cb1ad7 100644 --- a/health/aidl/default/Android.bp +++ b/health/aidl/default/Android.bp @@ -192,33 +192,14 @@ cc_fuzz { name: "android.hardware.health-service.aidl_fuzzer", defaults: [ "libhealth_aidl_impl_user", + "service_fuzzer_defaults", ], static_libs: [ "android.hardware.health-V1-ndk", "libbase", - "libbinder_random_parcel", - "libcutils", "liblog", - "libutils", "fuzz_libhealth_aidl_impl", ], - target: { - android: { - shared_libs: [ - "libbinder_ndk", - "libbinder", - ], - }, - host: { - static_libs: [ - "libbinder_ndk", - "libbinder", - ], - }, - darwin: { - enabled: false, - }, - }, srcs: ["fuzzer.cpp"], fuzz_config: { cc: [ diff --git a/vibrator/aidl/default/Android.bp b/vibrator/aidl/default/Android.bp index c4140bebc8..78bb4ed0c4 100644 --- a/vibrator/aidl/default/Android.bp +++ b/vibrator/aidl/default/Android.bp @@ -57,33 +57,12 @@ cc_binary { cc_fuzz { name: "android.hardware.vibrator-service.example_fuzzer", host_supported: true, + defaults: ["service_fuzzer_defaults"], static_libs: [ "android.hardware.vibrator-V2-ndk", - "libbase", - "libbinder_random_parcel", - "libcutils", "liblog", "libvibratorexampleimpl", ], - target: { - android: { - shared_libs: [ - "libbinder_ndk", - "libbinder", - "libutils", - ], - }, - host: { - static_libs: [ - "libbinder_ndk", - "libbinder", - "libutils", - ], - }, - darwin: { - enabled: false, - }, - }, srcs: ["fuzzer.cpp"], fuzz_config: { cc: [