Merge "Use PDL libraries in gd/Android.bp" into main

system/gd/Android.bp

@@ -252,7 +252,6 @@ cc_binary {
         "BlueberryFacadeGeneratedStub_h",
         "BluetoothGeneratedBundlerSchema_h_bfbs",
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
         // Needed here to guarantee that generated zip file is created before
         // bluetooth_cert_tests.zip is packaged
         "BlueberryFacadeAndCertGeneratedStub_py",
@@ -265,7 +264,10 @@ cc_binary {
         "libbluetooth-dumpsys",
         "libbluetooth-protos",
         "libbluetooth_gd",
+        "libbluetooth_hci_pdl",
+        "libbluetooth_l2cap_pdl",
         "libbluetooth_rust_interop",
+        "libbluetooth_smp_pdl",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
         "libchrome",
@@ -380,7 +382,6 @@ cc_test {
         "BluetoothGeneratedDumpsysDataSchema_h",
         "BluetoothGeneratedDumpsysInternalTestData_h",
         "BluetoothGeneratedDumpsysTestData_h",
-        "BluetoothGeneratedPackets_h",
     ],
     static_libs: [
         "libbluetooth-dumpsys",
@@ -388,7 +389,10 @@ cc_test {
         "libbluetooth-dumpsys-unittest",
         "libbluetooth-protos",
         "libbluetooth_gd_unit_tests",
+        "libbluetooth_hci_pdl",
+        "libbluetooth_l2cap_pdl",
         "libbluetooth_rust_interop",
+        "libbluetooth_smp_pdl",
         "libbt-platform-protos-lite",
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
@@ -476,7 +480,6 @@ cc_defaults {
     host_supported: true,
     generated_headers: [
         "BluetoothGeneratedDumpsysDataSchema_h",
-        "BluetoothGeneratedPackets_h",
     ],
     shared_libs: [
         "libcrypto",
@@ -745,21 +748,19 @@ cc_library_host_shared {
     srcs: [
         ":BluetoothPacketSources",
         "common/strings.cc",
-        "hci/address.cc",
-        "hci/class_of_device.cc",
         "l2cap/fcs.cc",
         "packet/python3_module.cc",
 
     ],
-    generated_headers: [
-        "BluetoothGeneratedPackets_h",
-    ],
     generated_sources: [
         "BluetoothGeneratedPackets_python3_cc",
     ],
     header_libs: [
         "pybind11_headers",
     ],
+    static_libs: [
+        "libbluetooth_l2cap_pdl",
+    ],
     cflags: [
         "-fexceptions",
     ],