From 25a2f5e504fb4bb08f6a9e99e2eeed7859a350a7 Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Wed, 20 Sep 2017 09:31:32 -0700
Subject: [PATCH] Get rid of unused _DYNAMIC_MEMORY

Removed the unused BTA_DYNAMIC_MEMORY and HID_DYNAMIC_LIBRARY

Bug: 27731905
Test: Manual
Change-Id: I6019584b165471c4058a2ec7ef8f278531153d18
---
 bta/hd/bta_hd_int.h   | 5 -----
 bta/hd/bta_hd_main.cc | 2 --
 stack/hid/hidd_api.cc | 2 --
 stack/hid/hidd_int.h  | 5 -----
 4 files changed, 14 deletions(-)

diff --git a/bta/hd/bta_hd_int.h b/bta/hd/bta_hd_int.h
index 318e3500f..09c0f5a2a 100644
--- a/bta/hd/bta_hd_int.h
+++ b/bta/hd/bta_hd_int.h
@@ -141,12 +141,7 @@ typedef struct {
   bool disable_w4_close;
 } tBTA_HD_CB;
 
-#if BTA_DYNAMIC_MEMORY == FALSE
 extern tBTA_HD_CB bta_hd_cb;
-#else
-extern tBTA_HD_CB* bta_hd_cb_ptr;
-#define bta_hd_cb (*bta_hd_cb_ptr)
-#endif
 
 /*****************************************************************************
  *  Function prototypes
diff --git a/bta/hd/bta_hd_main.cc b/bta/hd/bta_hd_main.cc
index dff5d9caf..1ae2d4861 100644
--- a/bta/hd/bta_hd_main.cc
+++ b/bta/hd/bta_hd_main.cc
@@ -219,9 +219,7 @@ const tBTA_HD_ST_TBL bta_hd_st_tbl[] = {bta_hd_st_init, bta_hd_st_idle,
 /*****************************************************************************
  * Global data
  ****************************************************************************/
-#if BTA_DYNAMIC_MEMORY == FALSE
 tBTA_HD_CB bta_hd_cb;
-#endif
 
 static const char* bta_hd_evt_code(tBTA_HD_INT_EVT evt_code);
 static const char* bta_hd_state_code(tBTA_HD_STATE state_code);
diff --git a/stack/hid/hidd_api.cc b/stack/hid/hidd_api.cc
index 8ae70c316..20fd36753 100644
--- a/stack/hid/hidd_api.cc
+++ b/stack/hid/hidd_api.cc
@@ -34,9 +34,7 @@
 #include "hidd_int.h"
 #include "hiddefs.h"
 
-#if HID_DYNAMIC_MEMORY == FALSE
 tHID_DEV_CTB hd_cb;
-#endif
 
 /*******************************************************************************
  *
diff --git a/stack/hid/hidd_int.h b/stack/hid/hidd_int.h
index 81e60cab9..afc5f0462 100644
--- a/stack/hid/hidd_int.h
+++ b/stack/hid/hidd_int.h
@@ -80,12 +80,7 @@ extern "C" {
 /******************************************************************************
  * Main Control Block
  ******************************************************************************/
-#if HID_DYNAMIC_MEMORY == FALSE
 extern tHID_DEV_CTB hd_cb;
-#else
-extern tHID_DEV_CTB* hidd_cb_ptr;
-#define hd_cb (*hidd_cb_ptr)
-#endif
 
 #ifdef __cplusplus
 }
-- 
2.11.0