diff --git a/automotive/occupant_awareness/aidl/default/Android.bp b/automotive/occupant_awareness/aidl/default/Android.bp index 3dc7e0d9d1..1b760a5ac0 100644 --- a/automotive/occupant_awareness/aidl/default/Android.bp +++ b/automotive/occupant_awareness/aidl/default/Android.bp @@ -42,18 +42,11 @@ cc_binary { cc_fuzz { name: "android.hardware.automotive.occupant_awareness-service.fuzzer", + defaults: ["service_fuzzer_defaults"], static_libs: [ "android.hardware.automotive.occupant_awareness-V1-ndk", - "libbase", - "libbinder_random_parcel", - "libcutils", "liblog", ], - shared_libs: [ - "libbinder_ndk", - "libbinder", - "libutils", - ], srcs: [ "fuzzer.cpp", "OccupantAwareness.cpp", diff --git a/automotive/vehicle/aidl/impl/vhal/Android.bp b/automotive/vehicle/aidl/impl/vhal/Android.bp index 6fec2c979c..4feea79490 100644 --- a/automotive/vehicle/aidl/impl/vhal/Android.bp +++ b/automotive/vehicle/aidl/impl/vhal/Android.bp @@ -74,19 +74,12 @@ cc_fuzz { "FakeVehicleHardwareDefaults", "VehicleHalDefaults", "android-automotive-large-parcelable-defaults", + "service_fuzzer_defaults", ], static_libs: [ "DefaultVehicleHal", "FakeVehicleHardware", "VehicleHalUtils", - "libbase", - "libbinder_random_parcel", - "libcutils", - ], - shared_libs: [ - "libbinder_ndk", - "libbinder", - "libutils", ], srcs: ["src/fuzzer.cpp"], fuzz_config: {