diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index afb2f718213cc3c6b230f230b5917cc90b70a5cc..2b1dc1b9375b753aac6c5d77616abac0a61d243c 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -233,7 +233,6 @@ cc_test {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     shared_libs: [
         "android.hardware.bluetooth.audio@2.0",
@@ -245,6 +244,7 @@ cc_test {
         "crypto_toolbox_for_tests",
         "libbluetooth-types",
         "libbluetooth_gd",
+        "libbluetooth_hci_pdl",
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
@@ -323,7 +323,6 @@ cc_test {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     srcs: [
         ":BtaDmSources",
@@ -416,6 +415,7 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbluetooth_gd",
+        "libbluetooth_hci_pdl",
         "libbt-common",
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
@@ -1227,6 +1227,7 @@ cc_test {
         "crypto_toolbox_for_tests",
         "libbluetooth-types",
         "libbluetooth_gd",
+        "libbluetooth_hci_pdl",
         "libbt-common",
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
@@ -1239,7 +1240,6 @@ cc_test {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     sanitize: {
         cfi: true,
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index d1b18ef493abb220dd268a152dee2dec8eac6a76..dec79d76e54ffdf5f74b6d1a6b2c43bf791e3b8d 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -122,7 +122,6 @@ cc_library_static {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     local_include_dirs: [
         "include",
@@ -210,7 +209,6 @@ cc_library_static {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     target: {
         android: {
@@ -348,7 +346,6 @@ cc_test {
     header_libs: ["libbluetooth_headers"],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     static_libs: [
         "libbluetooth-types",
@@ -383,7 +380,6 @@ cc_test {
     header_libs: ["libbluetooth_headers"],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     static_libs: [
         "libbluetooth-types",
@@ -591,7 +587,6 @@ cc_test {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     header_libs: ["libbluetooth_headers"],
     shared_libs: [
@@ -728,7 +723,6 @@ cc_test {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     header_libs: ["libbluetooth_headers"],
     shared_libs: [
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index d693301f0d46428340393e41a171d0e8e8919088..fd1dd47b60fed055a343c563564a90975b31c1c6 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -17,7 +17,6 @@ cc_library_static {
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     local_include_dirs: [
         "include",