Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

system/bta/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -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,

system/btif/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -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: [

system/hci/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ cc_library_static { 
    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    local_include_dirs: [

        "include",