commit b9447036ff1bc11de4a0f38c1e6337f532e6e622
author Prerepa Viswanadham <dham@google.com> Thu Aug 07 18:30:59 2014 -0700
committer Prerepa Viswanadham <dham@google.com> Fri Aug 08 01:31:43 2014 +0000
tree 7a47f0b6e4f84ed1c8b62d5e587543ede41ee3bd
parent d77eec93e5299f5bff987fceceba612b33251a14

Fix build error in bluedroid

Change-Id: I6bcf655540f13db578948ac8eddde971637ed26b

bta/dm/bta_dm_api.c

diff --git a/bta/dm/bta_dm_api.c b/bta/dm/bta_dm_api.c
index 2e4d966..3fe920a 100644
--- a/bta/dm/bta_dm_api.c
+++ b/bta/dm/bta_dm_api.c
@@ -1822,14 +1822,15 @@
 
         if (p_services != NULL)
         {
+#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE
             p_msg->services = p_services->srvc_mask;
             p_msg->num_uuid = p_services->num_uuid;
-
             if (p_services->num_uuid != 0)
             {
                 p_msg->p_uuid = (tBT_UUID *)(p_msg + 1);
                 memcpy(p_msg->p_uuid, p_services->p_uuid, sizeof(tBT_UUID) * p_services->num_uuid);
             }
+#endif
         }
 
         bta_sys_sendmsg(p_msg);

bta/dm/bta_dm_int.h

diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index 311ac5f..e54dcff 100644
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -924,8 +924,8 @@
     tBTA_DM_BLE_PF_STATUS_CBACK  *p_scan_filt_status_cback;
     tBTA_DM_BLE_PF_PARAM_CBACK   *p_scan_filt_param_cback;
     tBTA_BLE_MULTI_ADV_CBACK     *p_multi_adv_cback;
-#endif
     tBTA_BLE_ENERGY_INFO_CBACK   *p_energy_info_cback;
+#endif
     TIMER_LIST_ENT              signal_strength_timer;
     tBTA_SIG_STRENGTH_MASK      signal_strength_mask;
     UINT16                      state;

bta/dm/bta_dm_main.c

diff --git a/bta/dm/bta_dm_main.c b/bta/dm/bta_dm_main.c
index 92bc812..35835c7 100644
--- a/bta/dm/bta_dm_main.c
+++ b/bta/dm/bta_dm_main.c
@@ -118,8 +118,8 @@
     bta_dm_ble_disable_batch_scan, /* BTA_DM_API_BLE_DISABLE_BATCH_SCAN_EVT */
     bta_dm_ble_read_scan_reports,  /* BTA_DM_API_BLE_READ_SCAN_REPORTS_EVT */
     bta_dm_ble_track_advertiser,   /* BTA_DM_API_BLE_TRACK_ADVERTISER_EVT */
-#endif
     bta_dm_ble_get_energy_info,    /* BTA_DM_API_BLE_ENERGY_INFO_EVT */
+#endif
 
 #if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
     bta_dm_update_eir_uuid,     /*  BTA_DM_API_UPDATE_EIR_UUID_EVT      */