am f29a2fb..e07ad10 from mirror-m-wireless-internal-release

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

diff --git a/stack/Android.mk b/stack/Android.mk
index 10eb446..ccb5dc6 100644 (file)
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -43,7 +43,6 @@ LOCAL_CFLAGS += \
        -DBOARD_HAVE_BLUETOOTH_BCM
 endif
 
-LOCAL_PRELINK_MODULE:=false
 LOCAL_SRC_FILES:= \
     ./a2dp/a2d_api.c \
     ./a2dp/a2d_sbc.c \
@@ -167,5 +166,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_STATIC_LIBRARIES := libbt-hci
 LOCAL_SHARED_LIBRARIES := libcutils libc
 LOCAL_MULTILIB := 32
+# gnu-variable-sized-type-not-at-end is needed for a variable-size header in
+# a struct.
+# const-logical-operand is needed for code in l2c_utils.c that looks intentional.
+LOCAL_CLANG_CFLAGS += -Wno-error=gnu-variable-sized-type-not-at-end -Wno-error=constant-logical-operand
 
 include $(BUILD_STATIC_LIBRARY)