tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Turn on -Werror for recovery

Browse source 
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 7aa88748f6)
This commit is contained in:
Tianjie Xu 2016-09-28 11:42:17 -07:00
parent 4c3f6ab8f7
commit 17e316cce0
11 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Android.mk
View file

@ -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 \

5
applypatch/Android.mk
View file

@ -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)

1
bootloader_message/Android.mk
View file

@ -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)

2
edify/Android.mk
View file

@ -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

2
minui/Android.mk
View file

@ -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)

2
otafault/Android.mk
View file

@ -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

6
recovery.cpp
View file

@ -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" << "\"" <<boot_recovery << "\"";
}

3
tests/Android.mk
View file

@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
# Unit tests
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CFLAGS := -Werror
LOCAL_MODULE := recovery_unit_test
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_STATIC_LIBRARIES := \
@ -35,7 +36,7 @@ include $(BUILD_NATIVE_TEST)
# Component tests
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-unused-parameter -Werror
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := recovery_component_test
LOCAL_C_INCLUDES := bootable/recovery

13
uncrypt/Android.mk
View file

@ -17,16 +17,15 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SRC_FILES := uncrypt.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_MODULE := uncrypt
LOCAL_STATIC_LIBRARIES := libbootloader_message libbase \
liblog libfs_mgr libcutils \
LOCAL_STATIC_LIBRARIES := libbootloader_message \
libbase \
liblog \
libfs_mgr \
libcutils
LOCAL_CFLAGS := -Werror
LOCAL_INIT_RC := uncrypt.rc
include $(BUILD_EXECUTABLE)

1
update_verifier/Android.mk
View file

@ -23,5 +23,6 @@ LOCAL_MODULE := update_verifier
LOCAL_SHARED_LIBRARIES := libbase libcutils libhardware liblog
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_CFLAGS := -Werror
include $(BUILD_EXECUTABLE)

2
updater/Android.mk
View file

@ -61,7 +61,7 @@ LOCAL_STATIC_LIBRARIES += \
libtune2fs \
$(tune2fs_static_libraries)
LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-unused-parameter -Werror
LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += \
libsparse_static \