Do not log unsolicited NOOP command complete events

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

diff --git a/hci/Android.mk b/hci/Android.mk
index e267812..24e3d4d 100644 (file)
--- a/hci/Android.mk
+++ b/hci/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
+# HCI static library for target
+# ========================================================
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -19,12 +21,6 @@ LOCAL_SRC_FILES := \
     src/packet_fragmenter.c \
     src/vendor.c
 
-ifeq ($(BLUETOOTH_HCI_USE_MCT),true)
-LOCAL_CFLAGS += -DHCI_USE_MCT
-endif
-
-LOCAL_CFLAGS += -std=c99 $(bdroid_CFLAGS)
-
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/.. \
@@ -33,15 +29,21 @@ LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/../stack/include \
     $(LOCAL_PATH)/../utils/include \
     $(LOCAL_PATH)/../bta/include \
-    $(bdroid_C_INCLUDES)
+    $(bluetooth_C_INCLUDES)
 
 LOCAL_MODULE := libbt-hci
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+ifeq ($(BLUETOOTH_HCI_USE_MCT),true)
+LOCAL_CFLAGS += -DHCI_USE_MCT
+endif
+LOCAL_CFLAGS += $(bluetooth_CFLAGS)
+LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
+LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
 
 include $(BUILD_STATIC_LIBRARY)
 
-#####################################################
+# HCI unit tests for target
+# ========================================================
 ifeq (,$(strip $(SANITIZE_TARGET)))
 include $(CLEAR_VARS)
 
@@ -53,8 +55,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../osi/test \
     $(LOCAL_PATH)/../stack/include \
     $(LOCAL_PATH)/../utils/include \
-    $(bdroid_C_INCLUDES)
-
+    $(bluetooth_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
     ../osi/test/AllocationTestHarness.cpp \
@@ -63,15 +64,16 @@ LOCAL_SRC_FILES := \
     ./test/hci_hal_mct_test.cpp \
     ./test/hci_layer_test.cpp \
     ./test/low_power_manager_test.cpp \
-    ./test/packet_fragmenter_test.cpp \
-    $(bdroid_C_INCLUDES)
-
+    ./test/packet_fragmenter_test.cpp
 
-LOCAL_CFLAGS := -Wall -Werror $(bdroid_CFLAGS)
 LOCAL_MODULE := net_test_hci
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libdl
-LOCAL_STATIC_LIBRARIES := libbt-hci libosi libcutils libbtcore
+LOCAL_SHARED_LIBRARIES := liblog libdl libprotobuf-cpp-full
+LOCAL_STATIC_LIBRARIES := libbt-hci libosi libcutils libbtcore libbt-protos
+
+LOCAL_CFLAGS += $(bluetooth_CFLAGS)
+LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
+LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
 
 include $(BUILD_NATIVE_TEST)
 endif # SANITIZE_TARGET