summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-19 18:02:52 -0800
committerDan Albert <danalbert@google.com>2015-02-19 18:02:52 -0800
commit098f6a78457476a4d3eedf57e9efaad5681c9c67 (patch)
tree714fc56c3a540d999a54c1064e2b1db4641c25b5
parent15f13389b9792c3734ff494d5ea93ffe1ba0f28d (diff)
downloadbluedroid-098f6a78457476a4d3eedf57e9efaad5681c9c67.tar.gz
Fix the GCC build after fixing the clang build.
GCC doesn't know this flag, and apparently GCC only actually complains about not knowing the flag if there is at least one warning emitted. Change-Id: Ic63b915d1f111fead46184ccd765d7a79fb531f9
-rw-r--r--Android.mk2
-rw-r--r--main/Android.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index e590c1f..a8c40c8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@ endif
bdroid_CFLAGS += -Wall -Werror
# Temporary, remove after cleanup. b/18632512
-bdroid_CFLAGS += -Wno-unused -Wno-typedef-redefinition
+bdroid_CFLAGS += -Wno-unused
ifneq ($(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED),)
bdroid_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)
diff --git a/main/Android.mk b/main/Android.mk
index d7c3d0a..3357b8e 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -145,5 +145,6 @@ LOCAL_REQUIRED_MODULES := \
LOCAL_MULTILIB := 32
LOCAL_CLANG_CFLAGS := -Wno-error=gnu-variable-sized-type-not-at-end
+LOCAL_CLANG_CFLAGS += -Wno-typedef-redefinition
include $(BUILD_SHARED_LIBRARY)