diff --git a/media/libaudiofoundation/Android.bp b/media/libaudiofoundation/Android.bp
index efa5359..9296d0e 100644
--- a/media/libaudiofoundation/Android.bp
+++ b/media/libaudiofoundation/Android.bp
@@ -5,20 +5,20 @@
 
     export_include_dirs: ["include"],
     header_libs: [
+        "libaudioclient_aidl_conversion_util",
         "libaudio_system_headers",
         "libmedia_helper_headers",
     ],
     export_header_lib_headers: [
+        "libaudioclient_aidl_conversion_util",
         "libaudio_system_headers",
         "libmedia_helper_headers",
     ],
     static_libs: [
         "audioclient-types-aidl-unstable-cpp",
-        "libaudioclient_aidl_conversion",
     ],
     export_static_lib_headers: [
         "audioclient-types-aidl-unstable-cpp",
-        "libaudioclient_aidl_conversion",
     ],
     host_supported: true,
     target: {
@@ -53,6 +53,11 @@
         "libutils",
     ],
 
+    export_shared_lib_headers: [
+        "audioclient-types-aidl-unstable-cpp",
+        "libaudioclient_aidl_conversion",
+    ],
+
     header_libs: [
         "libaudiofoundation_headers",
     ],