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

Commit e4ca6c3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I0c83518f,Ie318c572 

* changes:
  floss: Add missing include dir
  floss: Ignore bt_keystore test in paramter_provider
parents 9f85225b 9e254a6c

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

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

        assert_eq!(now, "/data/misc/bluetooth/logs/btsnooz_hci.log");

    }

    }





    #[ignore]

    #[tokio::test]

    #[tokio::test]

    async fn test_bt_keystore_interface() {

    async fn test_bt_keystore_interface() {

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

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

system/stack/BUILD.gn

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

    "sdp",

    "smp",

    "smp",

    "srvc",

    "srvc",

    "//bt/system/types",

    "//bt/system/",

    "//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/bta/include",

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

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

    "//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/utils/include",

    "//bt/system/",

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

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

  ]

  ]





  deps = [

  deps = [