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

Merge "update_verifier: Set the success flag if dm-verity is not enabled."

Browse source
This commit is contained in:
Tao Bao 2017-03-11 01:32:43 +00:00 committed by Gerrit Code Review
commit a7211b3c16
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
update_verifier/Android.mk
View file

@ -32,4 +32,8 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)
LOCAL_CFLAGS += -DPRODUCT_SUPPORTS_VERITY=1
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

5
update_verifier/update_verifier.cpp
View file

@ -216,6 +216,8 @@ int main(int argc, char** argv) {
if (is_successful == BoolResult::FALSE) { if (is_successful == BoolResult::FALSE) {
// The current slot has not booted successfully. // The current slot has not booted successfully.
#ifdef PRODUCT_SUPPORTS_VERITY
std::string verity_mode = android::base::GetProperty("ro.boot.veritymode", ""); std::string verity_mode = android::base::GetProperty("ro.boot.veritymode", "");
if (verity_mode.empty()) { if (verity_mode.empty()) {
LOG(ERROR) << "Failed to get dm-verity mode."; LOG(ERROR) << "Failed to get dm-verity mode.";
@ -232,6 +234,9 @@ int main(int argc, char** argv) {
LOG(ERROR) << "Failed to verify all blocks in care map file."; LOG(ERROR) << "Failed to verify all blocks in care map file.";
return -1; return -1;
} }
#else
LOG(WARNING) << "dm-verity not enabled; marking without verification.";
#endif
CommandResult cr; CommandResult cr;
module->markBootSuccessful([&cr](CommandResult result) { cr = result; }); module->markBootSuccessful([&cr](CommandResult result) { cr = result; });