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

Commit 8fabbedf authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes I14481077,Ib38bd189,I6949cf85,Ia1c045d4,Ibddb7b9e into main 

* changes:
  system/stack/avdt: Migrate to libbluetooth_log
  system/stack/avct: Migrate to libbluetooth_log
  system/stack/arbiter: Migrate to libbluetooth_log
  system/stack/acl: Migrate to libbluetooth_log
  system/stack/a2dp: Migrate to libbluetooth_log
parents c36b9a0b 11f306f2

system/audio_hal_interface/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ cc_test { 
    shared_libs: [

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "libbase",

        "libbinder_ndk",

        "libcutils",

        "libfmq",
@@ -173,6 +174,7 @@ cc_test { 
        "aidl/a2dp_provider_info_unittest.cc",

    ],

    shared_libs: [

        "libbase",

        "libbase",

        "libcutils",

        "libfmq",
@@ -182,6 +184,7 @@ cc_test { 
    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth_log",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

system/audio_hal_interface/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ static_library("audio_hal_interface") { 
    "//bt/system/gd/rust/shim",

  ]



  configs += [ "//bt/system:target_defaults" ]

  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]



  deps = [

    "//bt/system/common",

system/common/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -37,7 +37,10 @@ static_library("common") { 
    "//bt/system/gd/rust/shim:init_flags_bridge_header",

  ]



  configs += [ "//bt/system:target_defaults" ]

  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]

}



if (use.test) {

system/device/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ static_library("device") { 


  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]



  deps = [

system/gd/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ config("gd_defaults") { 
  ]



  include_dirs = [ "//bt/system/gd" ]

  configs = [ "//bt/system:target_defaults" ]

  configs = [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]

}



config("rust_defaults") {