aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-11-03 16:14:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-11-03 16:14:23 +0000
commit742af969cbc6edbebe454dba86ea83a663c95cd2 (patch)
tree5739be326861dc12a88919f245f220f8f0cba573
parent288b128c86f85e87bb4df4047f40fb9308e4250c (diff)
parent22c035e2174cc1d167584810c50d9aa70d3108e8 (diff)
downloadbt-742af969cbc6edbebe454dba86ea83a663c95cd2.tar.gz
Merge "floss: Fix cannot find os/bt_keystore.h and missing include"
-rw-r--r--btif/BUILD.gn1
-rw-r--r--gd/rust/topshim/hfp/hfp_shim.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/btif/BUILD.gn b/btif/BUILD.gn
index 0100bb03d..26be562c3 100644
--- a/btif/BUILD.gn
+++ b/btif/BUILD.gn
@@ -102,6 +102,7 @@ static_library("btif") {
"//bt/device/include",
"//bt/embdrv/sbc/encoder/include",
"//bt/embdrv/sbc/decoder/include",
+ "//bt/gd",
"//bt/hci/include",
"//bt/stack/a2dp",
"//bt/stack/btm",
diff --git a/gd/rust/topshim/hfp/hfp_shim.h b/gd/rust/topshim/hfp/hfp_shim.h
index e8a962242..3ce8db036 100644
--- a/gd/rust/topshim/hfp/hfp_shim.h
+++ b/gd/rust/topshim/hfp/hfp_shim.h
@@ -16,6 +16,8 @@
#pragma once
+#include <memory>
+
#include "btif/include/btif_hf.h"
#include "include/hardware/bluetooth_headset_callbacks.h"
#include "types/raw_address.h"