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

Commit fd9eb614 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: fix log.h dependency of init_flag for ChromeOS" am: 9e6c8ca5... 

Merge "floss: fix log.h dependency of init_flag for ChromeOS" am: 9e6c8ca5 am: bbbdfa84 am: 6f1ec393

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2163108



Change-Id: I84f59ccaef832e797760742dab12986e16056b85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9e522b4 6f1ec393

system/gd/os/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ source_set("BluetoothOsSources_linux") { 
  ]



  configs += [ "//bt/system/gd:gd_defaults" ]

  deps = [ "//bt/system:libbt-platform-protos-lite" ]

  deps = [

    "//bt/system:libbt-platform-protos-lite",

    "//bt/system/gd/rust/shim:init_flags_bridge_header",

  ]

}



source_set("BluetoothOsSources_linux_generic") {

system/gd/os/log.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG is null after header inclusion"); 
    abort();                                                                        \

  } while (false)

#elif defined(TARGET_FLOSS)

#include "gd/common/init_flags.h"

#include "gd/os/syslog.h"



// Prefix the log with tag, file, line and function

system/gd/packet/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -28,5 +28,6 @@ source_set("BluetoothPacketSources") { 


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



  deps = [ "//bt/system/gd/rust/shim:init_flags_bridge_header" ]

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

}

system/gd/shim/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ source_set("BluetoothShimSources") { 
  deps = [

    "//bt/system/gd/dumpsys:libbluetooth-dumpsys",

    "//bt/system/gd/dumpsys/bundler:BluetoothGeneratedBundlerSchema_h_bfbs",

    "//bt/system/gd/rust/shim:init_flags_bridge_header",

  ]



  configs += [