diff options
author | Connor O'Brien <connoro@google.com> | 2016-11-18 21:48:09 +0100 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-18 21:48:09 +0100 |
commit | 692e95aa875390885741eedff604aa2b3afd4c64 (patch) | |
tree | 07008c6768743cc74f180c69a7934413a6ef6f78 /update_verifier | |
parent | Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours (diff) | |
parent | Revert "Convert update_verifier to boot HIDL HAL" (diff) | |
download | android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar.gz android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar.bz2 android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar.lz android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar.xz android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.tar.zst android_bootable_recovery-692e95aa875390885741eedff604aa2b3afd4c64.zip |
Diffstat (limited to '')
-rw-r--r-- | update_verifier/Android.mk | 9 | ||||
-rw-r--r-- | update_verifier/update_verifier.cpp | 31 |
2 files changed, 15 insertions, 25 deletions
diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk index 5d118f873..090db998b 100644 --- a/update_verifier/Android.mk +++ b/update_verifier/Android.mk @@ -20,14 +20,7 @@ LOCAL_CLANG := true LOCAL_SRC_FILES := update_verifier.cpp LOCAL_MODULE := update_verifier -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libcutils \ - libhardware \ - liblog \ - libutils \ - libhidl \ - android.hardware.boot@1.0 +LOCAL_SHARED_LIBRARIES := libbase libcutils libhardware liblog LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_CFLAGS := -Werror diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index e97a3adba..93ac605b1 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -45,12 +45,7 @@ #include <android-base/strings.h> #include <android-base/unique_fd.h> #include <cutils/properties.h> -#include <android/hardware/boot/1.0/IBootControl.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; +#include <hardware/boot_control.h> constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt"; constexpr int BLOCKSIZE = 4096; @@ -147,18 +142,21 @@ int main(int argc, char** argv) { LOG(INFO) << "Started with arg " << i << ": " << argv[i]; } - sp<IBootControl> module = IBootControl::getService("bootctrl"); - if (module == nullptr) { + const hw_module_t* hw_module; + if (hw_get_module("bootctrl", &hw_module) != 0) { LOG(ERROR) << "Error getting bootctrl module."; return -1; } - uint32_t current_slot = module->getCurrentSlot(); - BoolResult is_successful = module->isSlotMarkedSuccessful(current_slot); - LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful=" - << static_cast<int32_t>(is_successful); + boot_control_module_t* module = reinterpret_cast<boot_control_module_t*>( + const_cast<hw_module_t*>(hw_module)); + module->init(module); + + 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. char verity_mode[PROPERTY_VALUE_MAX]; if (property_get("ro.boot.veritymode", verity_mode, "") == -1) { @@ -177,10 +175,9 @@ int main(int argc, char** argv) { return -1; } - CommandResult cr; - module->markBootSuccessful([&cr](CommandResult result) { cr = result; }); - if (!cr.success) { - LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg; + int ret = module->markBootSuccessful(module); + if (ret != 0) { + LOG(ERROR) << "Error marking booted successfully: " << strerror(-ret); return -1; } LOG(INFO) << "Marked slot " << current_slot << " as booted successfully."; |