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

Commit 3de3c437 authored by John Lai's avatar John Lai Committed by Automerger Merge Worker
Browse files

Merge "floss: Introduce Rootcanal" into main am: 7de9fc5e am: 52f7357a am:... 

Merge "floss: Introduce Rootcanal" into main am: 7de9fc5e am: 52f7357a am: ad19a477 am: da4d3fa2

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



Change-Id: I9fffde8ae5d5629a6547afddc68afca233c140a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 622ba70d da4d3fa2

build.py

+5 −1
Original line number Diff line number Diff line
@@ -44,17 +44,21 @@ COMMON_MK_USES = [ 
    'coverage',

    'cros_host',

    'cros_debug',

    'floss_rootcanal',

    'function_elimination_experiment',

    'fuzzer',

    'fuzzer',

    'lto_experiment',

    'msan',

    'profiling',

    'proto_force_optimize_speed',

    'tcmalloc',

    'test',

    'ubsan',

]



# Use a specific commit version for common-mk to avoid build surprises.

COMMON_MK_COMMIT = "136c3e114b65f2c6c5f026376c2e75c73c2478a3"

COMMON_MK_COMMIT = "d014d561eaf5ece08166edd98b10c145ef81312d"



# Default use flags.

USE_DEFAULTS = {

system/gd/hal/BUILD.gn

+11 −4
Original line number Diff line number Diff line
@@ -27,10 +27,17 @@ source_set("BluetoothHalSources") { 
}



source_set("BluetoothHalSources_hci_host") {

  if (use.floss_rootcanal) {

    sources = [

      "hci_hal_host_rootcanal.cc",

      "mgmt.cc",

    ]

  } else {

    sources = [

      "hci_hal_host.cc",

      "mgmt.cc",

    ]

  }



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

  deps = [ "//bt/system/gd:gd_default_deps" ]