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

Commit 80120578 authored Feb 20, 2015 by Dan Albert Committed by Android Git Automerger Feb 20, 2015

am 95096b52: Fix the GCC build after fixing the clang build.

* commit '95096b52':
  Fix the GCC build after fixing the clang build.

parents f983a165 95096b52

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

system/main/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)