From: Mike J. Chen Date: Tue, 11 Feb 2014 21:01:26 +0000 (-0800) Subject: Revert "Make all warnings fatal compilation errors" X-Git-Tag: android-x86-7.1-r1~1281^2~54^2~47^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b9c7f79c52128a86c81280fe03e62c007a9bf37;p=android-x86%2Fsystem-bt.git Revert "Make all warnings fatal compilation errors" This reverts commit ba1ee422cee82449e675a52a785dac1a9200a3df. When BLE_INCLUDED is FALSE, we still have a bunch of warnings so revert until that path is cleaned up. --- diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk index c40a7a34f..f9fd0a182 100644 --- a/audio_a2dp_hw/Android.mk +++ b/audio_a2dp_hw/Android.mk @@ -2,8 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_C_FLAGS := -Werror - LOCAL_SRC_FILES:= \ audio_a2dp_hw.c diff --git a/bta/Android.mk b/bta/Android.mk index f53021cf6..bca6c0828 100644 --- a/bta/Android.mk +++ b/bta/Android.mk @@ -8,7 +8,7 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ -DBOARD_HAVE_BLUETOOTH_BCM endif -LOCAL_CFLAGS += -Werror -DBUILDCFG $(bdroid_CFLAGS) +LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) LOCAL_PRELINK_MODULE:=false LOCAL_SRC_FILES:= \ diff --git a/gki/Android.mk b/gki/Android.mk index 0ece25bec..ed9f904d7 100644 --- a/gki/Android.mk +++ b/gki/Android.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES:= $(LOCAL_PATH)/common \ $(LOCAL_PATH)/../utils/include \ $(bdroid_C_INCLUDES) \ -LOCAL_CFLAGS += -Werror $(bdroid_CFLAGS) +LOCAL_CFLAGS += -Werror -Wno-error=unused-parameter $(bdroid_CFLAGS) ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ diff --git a/hci/Android.mk b/hci/Android.mk index 4cbc91d73..2b1b07e03 100644 --- a/hci/Android.mk +++ b/hci/Android.mk @@ -25,8 +25,6 @@ LOCAL_SRC_FILES += \ endif -LOCAL_CFLAGS += -Werror - LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../utils/include diff --git a/main/Android.mk b/main/Android.mk index 147f6f5e4..5230b328a 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -99,7 +99,7 @@ LOCAL_C_INCLUDES+= . \ $(bdroid_C_INCLUDES) \ external/tinyxml2 -LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Werror +LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=unused-parameter ifeq ($(TARGET_PRODUCT), full_crespo) LOCAL_CFLAGS += -DTARGET_CRESPO diff --git a/stack/Android.mk b/stack/Android.mk index b762450c5..92ce2538f 100755 --- a/stack/Android.mk +++ b/stack/Android.mk @@ -32,7 +32,7 @@ LOCAL_C_INCLUDES:= . \ $(LOCAL_PATH)/../utils/include \ $(bdroid_C_INCLUDES) \ -LOCAL_CFLAGS += -Werror $(bdroid_CFLAGS) +LOCAL_CFLAGS += $(bdroid_CFLAGS) ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \