Merge "audio: Update fuzzer makefiles" into main am: 8a6495beb6 am: 4a422c4358

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3218934

Change-Id: I2e07e57ea1f36af5ab31f8234e16fe200949922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudioclient/aidl/fuzzer/Android.bp b/media/libaudioclient/aidl/fuzzer/Android.bp
index 75609a5..61d5ccd 100644
--- a/media/libaudioclient/aidl/fuzzer/Android.bp
+++ b/media/libaudioclient/aidl/fuzzer/Android.bp
@@ -34,17 +34,9 @@
     ],
     shared_libs: [
         "android.hardware.audio.common-util",
-        "av-types-aidl-cpp",
-        "effect-aidl-cpp",
         "libaudioflinger",
-        "libaudiomanager",
         "libaudiopolicyservice",
-        "libaudioprocessing",
         "libdl",
-        "libnbaio",
-        "libnblog",
-        "libpowermanager",
-        "libvibrator",
         "libvndksupport",
         "mediametricsservice-aidl-cpp",
     ],
@@ -74,6 +66,7 @@
         "latest_android_hardware_audio_core_sounddose_ndk_shared",
         "latest_android_hardware_audio_effect_ndk_shared",
         "libaudioclient_aidl_fuzzer_defaults",
+        "libaudioflinger_dependencies",
         "libaudiopolicyservice_dependencies",
         "service_fuzzer_defaults",
     ],
diff --git a/services/audiopolicy/fuzzer/aidl/Android.bp b/services/audiopolicy/fuzzer/aidl/Android.bp
index 0ae4dc5..680f76d 100644
--- a/services/audiopolicy/fuzzer/aidl/Android.bp
+++ b/services/audiopolicy/fuzzer/aidl/Android.bp
@@ -25,14 +25,7 @@
     shared_libs: [
         "libaudioflinger",
         "libaudiopolicyservice",
-        "libaudioprocessing",
-        "libhidlbase",
         "libmediaplayerservice",
-        "libnbaio",
-        "libnblog",
-        "libpowermanager",
-        "libvibrator",
-        "packagemanager_aidl-cpp",
     ],
     static_libs: [
         "libaudiomockhal",
@@ -63,6 +56,7 @@
         "latest_android_hardware_audio_core_ndk_shared",
         "latest_android_hardware_audio_core_sounddose_ndk_shared",
         "latest_android_hardware_audio_effect_ndk_shared",
+        "libaudioflinger_dependencies",
         "libaudiopolicyservice_dependencies",
         "service_fuzzer_defaults",
     ],