Fix build breakage due to bad rebase

Change-Id: Ide8190f10add027b18a34bb2604d3cd407d94224

diff --git a/gki/common/gki.h b/gki/common/gki.h
index 662396b..c190426 100644 (file)
--- a/gki/common/gki.h
+++ b/gki/common/gki.h
@@ -122,6 +122,8 @@ typedef struct
     UINT16   count;
 } BUFFER_Q;
 
+#define GKI_IS_QUEUE_EMPTY(p_q) ((p_q)->count == 0)
+
 /* Task constants
 */
 #ifndef TASKPTR

diff --git a/main/Android.mk b/main/Android.mk
index 5af1d23..34b1575 100644 (file)
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -128,6 +128,7 @@ LOCAL_STATIC_LIBRARIES := \
        libbt-brcm_stack \
        libbt-hci \
        libbt-utils \
+       libbt-qcom_sbc_decoder \
        libosi \
        libtinyxml2