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

Commit 7aa88748 authored by Tianjie Xu's avatar Tianjie Xu
Browse files

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
parent af8b9363

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,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 += \
@@ -146,6 +146,7 @@ LOCAL_SRC_FILES := \ 
    verifier.cpp \

    ui.cpp

LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase

LOCAL_CFLAGS := -Werror

include $(BUILD_STATIC_LIBRARY)



include $(LOCAL_PATH)/minui/Android.mk \

applypatch/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -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)

edify/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

minui/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)

otafault/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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