Snap for 4399706 from 495b0f7ab19144eafb1640b374536d1315d3f176 to pi-release
Change-Id: I418c9bff69818ed6c4d9a2628c331b2b4ef47a05
diff --git a/Android.mk b/Android.mk
index d45f930..e751893 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,11 +4,23 @@
# Minimal makefile capable of compiling futility to sign images
+libvboot_common_warning_flags := \
+ -Wall -Werror \
+ -Wno-address-of-packed-member \
+ -Wno-ignored-qualifiers \
+ -Wno-macro-redefined \
+ -Wno-pointer-arith \
+ -Wno-sign-compare \
+ -Wno-typedef-redefinition \
+ -Wno-unused-parameter \
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libvboot_util-host
+LOCAL_CFLAGS := $(libvboot_common_warning_flags)
+
ifeq ($(HOST_OS),darwin)
LOCAL_CFLAGS += -DHAVE_MACOS -DO_LARGEFILE=0
endif
@@ -118,6 +130,8 @@
LOCAL_MODULE_CLASS := EXECUTABLES
generated_sources := $(call local-generated-sources-dir)
+LOCAL_CFLAGS := $(libvboot_common_warning_flags)
+
ifeq ($(HOST_OS),darwin)
LOCAL_CFLAGS += -DHAVE_MACOS
endif
@@ -177,3 +191,4 @@
LOCAL_SHARED_LIBRARIES := libcrypto
include $(BUILD_HOST_EXECUTABLE)
+libvboot_common_warning_flags :=