Fix for uhid_event size check

[android-x86/system-bt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 91b00ea..c5d3d16 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 
-bdroid_CFLAGS := -Wno-unused-parameter
-
 # Setup bdroid local make variables for handling configuration
 ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)
   bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
@@ -11,13 +9,21 @@ else
   bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
 endif
 
-bdroid_CFLAGS += -Wall -Werror
-bdroid_CFLAGS += -DBTA_AVK_INCLUDED
-
 ifneq ($(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED),)
   bdroid_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)
 endif
 
+ifneq ($(TARGET_BUILD_VARIANT),user)
+bdroid_CFLAGS += -DBLUEDROID_DEBUG
+endif
+
+bdroid_CFLAGS += \
+  -Wall \
+  -Wno-unused-parameter \
+  -Wunused-but-set-variable \
+  -UNDEBUG \
+  -DLOG_NDEBUG=1
+
 include $(call all-subdir-makefiles)
 
 # Cleanup our locals