summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-04-19 14:52:01 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-04-19 14:52:01 -0700
commit5320f7cc30ffd6965c133283dfdd915b0eed873d (patch)
tree39cf490001ee53551df489339cc84eca8f4bf871 /main
parentbdcf617f317d0bd16bf2b2d2bd7f295e4a89cd1b (diff)
parent3ddadd2c27e6a22e2d2b205e9ff73d13e0c35cc5 (diff)
downloadandroid_system_bt-5320f7cc30ffd6965c133283dfdd915b0eed873d.tar.gz
android_system_bt-5320f7cc30ffd6965c133283dfdd915b0eed873d.tar.bz2
android_system_bt-5320f7cc30ffd6965c133283dfdd915b0eed873d.zip
Merge tag 'android-6.0.1_r30' into HEAD
Android 6.0.1 release 30 RM-234 Change-Id: Ib49a88726f2df18ca5ecf04fae4e2d2d31ef9a82
Diffstat (limited to 'main')
-rw-r--r--main/bte_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/bte_main.c b/main/bte_main.c
index 648e46cd1..bd0e65c6e 100644
--- a/main/bte_main.c
+++ b/main/bte_main.c
@@ -45,6 +45,9 @@
#include "bt_utils.h"
#include "btcore/include/counter.h"
#include "btcore/include/module.h"
+#include "device/include/interop.h"
+#include "hci_layer.h"
+#include "osi/include/alarm.h"
#include "osi/include/fixed_queue.h"
#include "osi/include/future.h"
#include "gki.h"
@@ -97,6 +100,7 @@ void bte_main_boot_entry(void)
{
module_init(get_module(GKI_MODULE));
module_init(get_module(COUNTER_MODULE));
+ module_init(get_module(INTEROP_MODULE));
hci = hci_layer_get_interface();
if (!hci)
@@ -136,6 +140,7 @@ void bte_main_shutdown()
module_clean_up(get_module(STACK_CONFIG_MODULE));
+ module_clean_up(get_module(INTEROP_MODULE));
module_clean_up(get_module(COUNTER_MODULE));
module_clean_up(get_module(GKI_MODULE));
}