Fix bad address type assumption

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

diff --git a/btif/Android.mk b/btif/Android.mk
index 80e6c35..d6b934d 100644 (file)
--- a/btif/Android.mk
+++ b/btif/Android.mk
@@ -23,7 +23,8 @@ LOCAL_PATH := $(call my-dir)
 
 # HAL layer
 btifCommonSrc := \
-  src/bluetooth.c
+  src/bluetooth.c \
+  ../EventLogTags.logtags
 
 # BTIF implementation
 btifCommonSrc += \
@@ -35,6 +36,7 @@ btifCommonSrc += \
   src/btif_debug.c \
   src/btif_debug_btsnoop.c \
   src/btif_debug_conn.c \
+  src/btif_debug_l2c.c \
   src/btif_dm.c \
   src/btif_gatt.c \
   src/btif_gatt_client.c \
@@ -73,7 +75,6 @@ btifCommonSrc += \
   co/bta_hh_co.c \
   co/bta_hl_co.c \
   co/bta_pan_co.c \
-  co/bta_gattc_co.c \
   co/bta_gatts_co.c
 
 # Tests
@@ -106,32 +107,39 @@ btifCommonIncludes := \
   $(LOCAL_PATH)/../embdrv/sbc/decoder/include \
   $(LOCAL_PATH)/../audio_a2dp_hw \
   $(LOCAL_PATH)/../utils/include \
-  $(bdroid_C_INCLUDES) \
+  $(bluetooth_C_INCLUDES) \
   external/tinyxml2 \
   external/zlib
 
-btifCommonCFlags += -DBUILDCFG $(bdroid_CFLAGS) -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=unused-parameter
-
 # libbtif static library for target
 # ========================================================
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := $(btifCommonIncludes)
 LOCAL_SRC_FILES := $(btifCommonSrc)
-LOCAL_CFLAGS := $(btifCommonCFlags)
 # Many .h files have redefined typedefs
-LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition
-LOCAL_SHARED_LIBRARIES := libc liblog
+LOCAL_SHARED_LIBRARIES := libcutils liblog
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libbtif
+
+LOCAL_CFLAGS += $(bluetooth_CFLAGS) -DBUILDCFG
+LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
+LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
+
 include $(BUILD_STATIC_LIBRARY)
 
+# btif unit tests for target
+# ========================================================
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := $(btifCommonIncludes)
 LOCAL_SRC_FILES := $(btifTestSrc)
-LOCAL_CFLAGS := $(btifCommonCFlags)
 LOCAL_SHARED_LIBRARIES += liblog libhardware libhardware_legacy libcutils
 LOCAL_STATIC_LIBRARIES += libbtcore libbtif libosi
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := net_test_btif
+
+LOCAL_CFLAGS += $(bluetooth_CFLAGS) -DBUILDCFG
+LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
+LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
+
 include $(BUILD_NATIVE_TEST)