Merge "Init variables to fix compiler error"
diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
index 913e253..9504766 100644
--- a/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@ -222,7 +222,7 @@
UINT8 state;
tBTM_IO_CAP loc_io_caps; /* IO capability of the local device */
- BOOLEAN loc_auth_req; /* the auth_req flag */
+ tBTM_AUTH_REQ loc_auth_req; /* the auth_req flag */
BD_FEATURES brcm_features; /* Broadcom specific features bit mask */
#define BTM_RELOAD_LE_HOST_FEATURE 0x10
@@ -601,7 +601,7 @@
#define BTM_SM4_CONN_PEND 0x40 /* set this bit to indicate accepting acl conn; to be cleared on btm_acl_created */
UINT8 sm4; /* BTM_SM4_TRUE, if the peer supports SM4 */
tBTM_IO_CAP rmt_io_caps; /* IO capability of the peer device */
- BOOLEAN rmt_auth_req; /* the auth_req flag as in the IO caps rsp evt */
+ tBTM_AUTH_REQ rmt_auth_req; /* the auth_req flag as in the IO caps rsp evt */
#if (BLE_INCLUDED == TRUE)
UINT16 ble_hci_handle; /* use in DUMO connection */
diff --git a/test/bluedroidtest/Android.mk b/test/bluedroidtest/Android.mk
index 36deb20..36ef8fe 100644
--- a/test/bluedroidtest/Android.mk
+++ b/test/bluedroidtest/Android.mk
@@ -30,9 +30,6 @@
LOCAL_MODULE:= bdt
-LOCAL_LDLIBS += -lpthread -ldl -llog -lreadline
-LIBS_c += -lreadline
-
LOCAL_SHARED_LIBRARIES += libcutils \
libutils \
libhardware \
@@ -41,4 +38,3 @@
LOCAL_MULTILIB := 32
include $(BUILD_EXECUTABLE)
-