Merge "Revert "Convert update_verifier to boot HIDL HAL"" (fc6e8cae) · Commits · e / tools / etwrp

update_verifier/Android.mk

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -24,10 +24,7 @@ LOCAL_SHARED_LIBRARIES := \
	libbase \		libbase \
	libcutils \		libcutils \
	libhardware \		libhardware \
	liblog \		liblog
	libutils \
	libhidl \
	android.hardware.boot@1.0

	LOCAL_CFLAGS := -Werror		LOCAL_CFLAGS := -Werror
	LOCAL_C_INCLUDES += $(LOCAL_PATH)/..		LOCAL_C_INCLUDES += $(LOCAL_PATH)/..

update_verifier/update_verifier.cpp

+14 −17

Original line number	Original line	Diff line number	Diff line
	@@ -45,12 +45,7 @@
	#include <android-base/strings.h>		#include <android-base/strings.h>
	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>
	#include <cutils/properties.h>		#include <cutils/properties.h>
	#include <android/hardware/boot/1.0/IBootControl.h>		#include <hardware/boot_control.h>

	using android::sp;
	using android::hardware::boot::V1_0::IBootControl;
	using android::hardware::boot::V1_0::BoolResult;
	using android::hardware::boot::V1_0::CommandResult;

	constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";		constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";
	constexpr int BLOCKSIZE = 4096;		constexpr int BLOCKSIZE = 4096;
	@@ -147,18 +142,21 @@ int main(int argc, char** argv) {
	LOG(INFO) << "Started with arg " << i << ": " << argv[i];		LOG(INFO) << "Started with arg " << i << ": " << argv[i];
	}		}

	sp<IBootControl> module = IBootControl::getService("bootctrl");		const hw_module_t* hw_module;
	if (module == nullptr) {		if (hw_get_module("bootctrl", &hw_module) != 0) {
	LOG(ERROR) << "Error getting bootctrl module.";		LOG(ERROR) << "Error getting bootctrl module.";
	return -1;		return -1;
	}		}

	uint32_t current_slot = module->getCurrentSlot();		boot_control_module_t* module = reinterpret_cast<boot_control_module_t*>(
	BoolResult is_successful = module->isSlotMarkedSuccessful(current_slot);		const_cast<hw_module_t*>(hw_module));
	LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful="		module->init(module);
	<< static_cast<int32_t>(is_successful);
			unsigned current_slot = module->getCurrentSlot(module);
			int is_successful= module->isSlotMarkedSuccessful(module, current_slot);
			LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful=" << is_successful;

	if (is_successful == BoolResult::FALSE) {		if (is_successful == 0) {
	// The current slot has not booted successfully.		// The current slot has not booted successfully.
	char verity_mode[PROPERTY_VALUE_MAX];		char verity_mode[PROPERTY_VALUE_MAX];
	if (property_get("ro.boot.veritymode", verity_mode, "") == -1) {		if (property_get("ro.boot.veritymode", verity_mode, "") == -1) {
	@@ -177,10 +175,9 @@ int main(int argc, char** argv) {
	return -1;		return -1;
	}		}

	CommandResult cr;		int ret = module->markBootSuccessful(module);
	module->markBootSuccessful([&cr](CommandResult result) { cr = result; });		if (ret != 0) {
	if (!cr.success) {		LOG(ERROR) << "Error marking booted successfully: " << strerror(-ret);
	LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg;
	return -1;		return -1;
	}		}
	LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";		LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";