Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da93e55c authored by Matthew Xie's avatar Matthew Xie Committed by Gerrit Code Review
Browse files

Merge "bluedroid: Fix build with gcc 4.8"

parents 81a5e646 e8b5ac1a

gki/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 += \

system/main/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ LOCAL_C_INCLUDES+= . \ 
	$(bdroid_C_INCLUDES) \

	external/tinyxml2



LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized

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