diff options
Diffstat (limited to 'gki')
| -rw-r--r-- | gki/Android.mk | 8 | ||||
| -rw-r--r-- | gki/common/gki.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/gki/Android.mk b/gki/Android.mk index c8d8923..13a4a95 100644 --- a/gki/Android.mk +++ b/gki/Android.mk @@ -7,10 +7,10 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES:= $(LOCAL_PATH)/common \ $(LOCAL_PATH)/ulinux \ $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../stack/include/ + $(LOCAL_PATH)/../stack/include \ + $(bdroid_C_INCLUDES) \ - -LOCAL_CFLAGS += -Werror +LOCAL_CFLAGS += -Werror $(bdroid_CFLAGS) ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ @@ -29,8 +29,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_MODULE_CLASS := STATIC_LIBRARIES -include $(LOCAL_PATH)/../include/buildcfg.mk - include $(BUILD_STATIC_LIBRARY) endif # TARGET_SIMULATOR != true diff --git a/gki/common/gki.h b/gki/common/gki.h index a1005dc..d53ab04 100644 --- a/gki/common/gki.h +++ b/gki/common/gki.h @@ -12,9 +12,6 @@ #ifndef GKI_H #define GKI_H -#ifdef BUILDCFG -#include "buildcfg.h" -#endif /* Include platform-specific over-rides */ #if (defined(NFC_STANDALONE) && (NFC_STANDALONE == TRUE)) |