From 17e316cce0047dcb892fb6dae9924cf6e0b41516 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Wed, 28 Sep 2016 11:42:17 -0700 Subject: Turn on -Werror for recovery Also remove the 0xff comparison when validating the bootloader message fields. As the fields won't be erased to 0xff after we remove the MTD support. Bug: 28202046 Test: The recovery folder compiles for aosp_x86-eng Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab (cherry picked from commit 7aa88748f6ec4e53333d1a15747bc44826ccc410) --- applypatch/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'applypatch') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 0fc6e3682..77e499ec6 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -36,6 +36,7 @@ LOCAL_STATIC_LIBRARIES += \ libcrypto \ libbz \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) # libimgpatch (static library) @@ -49,6 +50,7 @@ LOCAL_C_INCLUDES += \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES += libcrypto libbz libz +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) # libimgpatch (host static library) @@ -63,6 +65,7 @@ LOCAL_C_INCLUDES += \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES += libcrypto libbz libz +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_STATIC_LIBRARY) # applypatch (executable) @@ -81,6 +84,7 @@ LOCAL_STATIC_LIBRARIES += \ libcrypto \ libbz LOCAL_SHARED_LIBRARIES += libbase libz libcutils libc +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) # imgdiff (host static executable) @@ -95,5 +99,6 @@ LOCAL_STATIC_LIBRARIES += \ libdivsufsort64 \ libdivsufsort \ libz +LOCAL_CFLAGS := -Werror LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_HOST_EXECUTABLE) -- cgit v1.2.3