From d0bc21547cde6bbd8ef9139d2b8b9fb2b300ba8f Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@google.com>
Date: Tue, 10 Jun 2014 16:52:39 -0700
Subject: [PATCH] Fix build breakage due to bad rebase

Change-Id: Ide8190f10add027b18a34bb2604d3cd407d94224
---
 gki/common/gki.h | 2 ++
 main/Android.mk  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/gki/common/gki.h b/gki/common/gki.h
index 662396b5d..c19042630 100644
--- 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 5af1d2384..34b157563 100644
--- 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
 
-- 
2.11.0