From a759ebf350b61df3e60cc82f3a3b367b951f07d2 Mon Sep 17 00:00:00 2001
From: Pawan <waghpawan@google.com>
Date: Fri, 19 Aug 2022 22:32:21 +0000
Subject: [PATCH] Updating cc_fuzz with default service fuzzer config

Using service_fuzzer_defaults in
	- android.hardware.automotive.vehicle@V1-default-service_fuzzer
	- android.hardware.automotive.occupant_awareness-service.fuzzer

Bug: 240318902
Test: m android.hardware.automotive.vehicle@V1-default-service_fuzzer
Test: m android.hardware.automotive.occupant_awareness-service.fuzzer
Change-Id: I22cbbec92a7281081c355bb78d2ae87aa90732fa
---
 automotive/occupant_awareness/aidl/default/Android.bp | 9 +--------
 automotive/vehicle/aidl/impl/vhal/Android.bp          | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

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: {