Skip to content
Snippets Groups Projects
Commit a368ac18 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I86cdf958,I565db74f,I211ef03b into main

* changes:
  Remove dependency on PDL from hci/Android.bp
  Use PDL library in btif/Android.bp
  Use PDL library in bta/Android.bp
parents d3f4cf2e 2a951c4f
No related branches found
No related tags found
No related merge requests found
...@@ -233,7 +233,6 @@ cc_test { ...@@ -233,7 +233,6 @@ cc_test {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
shared_libs: [ shared_libs: [
"android.hardware.bluetooth.audio@2.0", "android.hardware.bluetooth.audio@2.0",
...@@ -245,6 +244,7 @@ cc_test { ...@@ -245,6 +244,7 @@ cc_test {
"crypto_toolbox_for_tests", "crypto_toolbox_for_tests",
"libbluetooth-types", "libbluetooth-types",
"libbluetooth_gd", "libbluetooth_gd",
"libbluetooth_hci_pdl",
"libbt-audio-hal-interface", "libbt-audio-hal-interface",
"libbt-bta", "libbt-bta",
"libbt-bta-core", "libbt-bta-core",
...@@ -323,7 +323,6 @@ cc_test { ...@@ -323,7 +323,6 @@ cc_test {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
srcs: [ srcs: [
":BtaDmSources", ":BtaDmSources",
...@@ -416,6 +415,7 @@ cc_test { ...@@ -416,6 +415,7 @@ cc_test {
static_libs: [ static_libs: [
"libbluetooth-types", "libbluetooth-types",
"libbluetooth_gd", "libbluetooth_gd",
"libbluetooth_hci_pdl",
"libbt-common", "libbt-common",
"libbt-platform-protos-lite", "libbt-platform-protos-lite",
"libbt_shim_bridge", "libbt_shim_bridge",
...@@ -1227,6 +1227,7 @@ cc_test { ...@@ -1227,6 +1227,7 @@ cc_test {
"crypto_toolbox_for_tests", "crypto_toolbox_for_tests",
"libbluetooth-types", "libbluetooth-types",
"libbluetooth_gd", "libbluetooth_gd",
"libbluetooth_hci_pdl",
"libbt-common", "libbt-common",
"libbt-platform-protos-lite", "libbt-platform-protos-lite",
"libbt_shim_bridge", "libbt_shim_bridge",
...@@ -1239,7 +1240,6 @@ cc_test { ...@@ -1239,7 +1240,6 @@ cc_test {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
sanitize: { sanitize: {
cfi: true, cfi: true,
......
...@@ -122,7 +122,6 @@ cc_library_static { ...@@ -122,7 +122,6 @@ cc_library_static {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
local_include_dirs: [ local_include_dirs: [
"include", "include",
...@@ -210,7 +209,6 @@ cc_library_static { ...@@ -210,7 +209,6 @@ cc_library_static {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
target: { target: {
android: { android: {
...@@ -348,7 +346,6 @@ cc_test { ...@@ -348,7 +346,6 @@ cc_test {
header_libs: ["libbluetooth_headers"], header_libs: ["libbluetooth_headers"],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
static_libs: [ static_libs: [
"libbluetooth-types", "libbluetooth-types",
...@@ -383,7 +380,6 @@ cc_test { ...@@ -383,7 +380,6 @@ cc_test {
header_libs: ["libbluetooth_headers"], header_libs: ["libbluetooth_headers"],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
static_libs: [ static_libs: [
"libbluetooth-types", "libbluetooth-types",
...@@ -591,7 +587,6 @@ cc_test { ...@@ -591,7 +587,6 @@ cc_test {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
header_libs: ["libbluetooth_headers"], header_libs: ["libbluetooth_headers"],
shared_libs: [ shared_libs: [
...@@ -728,7 +723,6 @@ cc_test { ...@@ -728,7 +723,6 @@ cc_test {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
header_libs: ["libbluetooth_headers"], header_libs: ["libbluetooth_headers"],
shared_libs: [ shared_libs: [
......
...@@ -17,7 +17,6 @@ cc_library_static { ...@@ -17,7 +17,6 @@ cc_library_static {
], ],
generated_headers: [ generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h", "BluetoothGeneratedDumpsysDataSchema_h",
"BluetoothGeneratedPackets_h",
], ],
local_include_dirs: [ local_include_dirs: [
"include", "include",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment