DO NOT MERGE Separate SDP procedure from bonding state (1/2)

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

diff --git a/Android.mk b/Android.mk
index 36b5807..29760e4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,33 +1,53 @@
 LOCAL_PATH := $(call my-dir)
 
-# Setup bdroid local make variables for handling configuration
+# Setup Bluetooth local make variables for handling configuration
 ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)
-  bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
-  bdroid_CFLAGS += -DHAS_BDROID_BUILDCFG
+  bluetooth_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
+  bluetooth_CFLAGS += -DHAS_BDROID_BUILDCFG
 else
-  bdroid_C_INCLUDES :=
-  bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
+  bluetooth_C_INCLUDES :=
+  bluetooth_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
 endif
 
 ifneq ($(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED),)
-  bdroid_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)
+  bluetooth_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)
 endif
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
-bdroid_CFLAGS += -DBLUEDROID_DEBUG
+bluetooth_CFLAGS += -DBLUEDROID_DEBUG
 endif
 
-bdroid_CFLAGS += -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))"
+bluetooth_CFLAGS += -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))"
 
-bdroid_CFLAGS += \
+#
+# Common C/C++ compiler flags.
+#
+# -Wno-gnu-variable-sized-type-not-at-end is needed, because struct BT_HDR
+#  is defined as a variable-size header in a struct.
+# -Wno-typedef-redefinition is needed because of the way the struct typedef
+#  is done in osi/include header files. This issue can be obsoleted by
+#  switching to C11 or C++.
+# -Wno-unused-parameter is needed, because there are too many unused
+#  parameters in all the code.
+#
+bluetooth_CFLAGS += \
   -fvisibility=hidden \
   -Wall \
-  -Wunused-but-set-variable \
+  -Wextra \
+  -Werror \
+  -Wno-gnu-variable-sized-type-not-at-end \
+  -Wno-typedef-redefinition \
+  -Wno-unused-parameter \
   -UNDEBUG \
   -DLOG_NDEBUG=1
 
+bluetooth_CONLYFLAGS += -std=c99
+bluetooth_CPPFLAGS :=
+
 include $(call all-subdir-makefiles)
 
 # Cleanup our locals
-bdroid_C_INCLUDES :=
-bdroid_CFLAGS :=
+bluetooth_C_INCLUDES :=
+bluetooth_CFLAGS :=
+bluetooth_CONLYFLAGS :=
+bluetooth_CPPFLAGS :=