Change-Id: I6499663d253c791cc739ed76b839eb3aefe6613a
Conflicts:
btif/src/btif_dm.c
btif/src/btif_gatt_multi_adv_util.c
Conflicts:
btif/src/btif_dm.c
btif/src/btif_gatt_multi_adv_util.c
btif_enable_bluetooth_evt(p_data->enable.status, p_data->enable.bd_addr);
+ #if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
/* Enable local privacy */
BTA_DmBleConfigLocalPrivacy(TRUE);
+ #endif
}
break;
#include <stdlib.h>
#define LOG_TAG "BtGatt.btif"
-#if (BLE_INCLUDED == TRUE)
+#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
#include "btif_gatt_multi_adv_util.h"
#include "btif_common.h"