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) --- Android.mk | 3 ++- applypatch/Android.mk | 5 +++++ bootloader_message/Android.mk | 1 + edify/Android.mk | 2 ++ minui/Android.mk | 2 ++ otafault/Android.mk | 2 ++ recovery.cpp | 6 +++--- tests/Android.mk | 3 ++- uncrypt/Android.mk | 13 ++++++------- update_verifier/Android.mk | 1 + updater/Android.mk | 2 +- 11 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Android.mk b/Android.mk index 74910a10f..185562307 100644 --- a/Android.mk +++ b/Android.mk @@ -65,7 +65,7 @@ endif RECOVERY_API_VERSION := 3 RECOVERY_FSTAB_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_CLANG := true LOCAL_C_INCLUDES += \ @@ -150,6 +150,7 @@ LOCAL_SRC_FILES := \ verifier.cpp \ ui.cpp LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) include \ 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) diff --git a/bootloader_message/Android.mk b/bootloader_message/Android.mk index 815ac67d7..a8c50819b 100644 --- a/bootloader_message/Android.mk +++ b/bootloader_message/Android.mk @@ -19,6 +19,7 @@ LOCAL_CLANG := true LOCAL_SRC_FILES := bootloader_message.cpp LOCAL_MODULE := libbootloader_message LOCAL_STATIC_LIBRARIES := libbase libfs_mgr +LOCAL_CFLAGS := -Werror LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_STATIC_LIBRARY) diff --git a/edify/Android.mk b/edify/Android.mk index 71cf7652a..b397045cf 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -16,6 +16,7 @@ LOCAL_SRC_FILES := \ $(edify_src_files) \ main.cpp +LOCAL_CFLAGS := -Werror LOCAL_CPPFLAGS := -g -O0 LOCAL_MODULE := edify LOCAL_YACCFLAGS := -v @@ -34,6 +35,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(edify_src_files) +LOCAL_CFLAGS := -Werror LOCAL_CPPFLAGS := -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_MODULE := libedify diff --git a/minui/Android.mk b/minui/Android.mk index 380ec2bfd..67b81fc6d 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -13,6 +13,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += libadf LOCAL_WHOLE_STATIC_LIBRARIES += libdrm LOCAL_WHOLE_STATIC_LIBRARIES += libsync_recovery LOCAL_STATIC_LIBRARIES += libpng +LOCAL_CFLAGS := -Werror LOCAL_MODULE := libminui @@ -46,4 +47,5 @@ LOCAL_CLANG := true LOCAL_MODULE := libminui LOCAL_WHOLE_STATIC_LIBRARIES += libminui LOCAL_SHARED_LIBRARIES := libpng +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) diff --git a/otafault/Android.mk b/otafault/Android.mk index 47c04050b..82c267101 100644 --- a/otafault/Android.mk +++ b/otafault/Android.mk @@ -23,6 +23,7 @@ otafault_static_libs := \ libbase \ liblog +LOCAL_CFLAGS := -Werror LOCAL_SRC_FILES := config.cpp ota_io.cpp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libotafault @@ -41,6 +42,7 @@ LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp LOCAL_MODULE_TAGS := tests LOCAL_MODULE := otafault_test LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) +LOCAL_CFLAGS := -Werror LOCAL_C_INCLUDES := bootable/recovery LOCAL_FORCE_STATIC_EXECUTABLE := true diff --git a/recovery.cpp b/recovery.cpp index c7d840dd6..7419bac00 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -318,12 +318,12 @@ get_args(int *argc, char ***argv) { } stage = strndup(boot.stage, sizeof(boot.stage)); - if (boot.command[0] != 0 && boot.command[0] != 255) { + if (boot.command[0] != 0) { std::string boot_command = std::string(boot.command, sizeof(boot.command)); LOG(INFO) << "Boot command: " << boot_command; } - if (boot.status[0] != 0 && boot.status[0] != 255) { + if (boot.status[0] != 0) { std::string boot_status = std::string(boot.status, sizeof(boot.status)); LOG(INFO) << "Boot status: " << boot_status; } @@ -340,7 +340,7 @@ get_args(int *argc, char ***argv) { (*argv)[*argc] = strdup(arg); } LOG(INFO) << "Got arguments from boot message"; - } else if (boot.recovery[0] != 0 && boot.recovery[0] != 255) { + } else if (boot.recovery[0] != 0) { std::string boot_recovery = std::string(boot.recovery, 20); LOG(ERROR) << "Bad boot message\n" << "\"" <