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

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

Merge changes I0c83518f,Ie318c572 am: e4ca6c3e am: d550016e 

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



Change-Id: Ie2708d55df58b050e59455f117c8dccfbe453b07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99de149a d550016e

system/gd/rust/common/src/parameter_provider.rs

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ mod tests { 
        assert_eq!(now, "/data/misc/bluetooth/logs/btsnooz_hci.log");

    }



    #[ignore]

    #[tokio::test]

    async fn test_bt_keystore_interface() {

        let prefix: String = (*(*MISC).lock().unwrap()).clone();

system/stack/BUILD.gn

+12 −11
Original line number Diff line number Diff line
@@ -205,20 +205,21 @@ source_set("stack") { 
    "sdp",

    "smp",

    "srvc",

    "//bt/system/types",

    "//bt/system/linux_include",

    "//bt/system/internal_include",

    "//bt/system/vnd/include",

    "//bt/system/vnd/ble",

    "//bt/system/btif/include",

    "//bt/system/udrv/include",

    "//bt/system/rpc/include",

    "//bt/system/hcis",

    "//bt/system/ctrlr/include",

    "//bt/system/",

    "//bt/system/bta/include",

    "//bt/system/bta/sys",

    "//bt/system/btif/include",

    "//bt/system/ctrlr/include",

    "//bt/system/gd",

    "//bt/system/hcis",

    "//bt/system/internal_include",

    "//bt/system/linux_include",

    "//bt/system/rpc/include",

    "//bt/system/types",

    "//bt/system/udrv/include",

    "//bt/system/utils/include",

    "//bt/system/",

    "//bt/system/vnd/ble",

    "//bt/system/vnd/include",

  ]



  deps = [