commit 7d17f64275cd4164ebefab4a2112c14e1825dd6d
author Connor O'Brien <connoro@google.com> Fri Nov 18 20:52:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 18 20:52:12 2016 +0000
tree 07008c6768743cc74f180c69a7934413a6ef6f78
parent 1d5bf16cf0808ab4a3abda63cb2aec06d48577e8
parent 7206ec7a1da4b0d88d0d75cb305d9bf665157366

Revert "Convert update_verifier to boot HIDL HAL"
am: 7206ec7a1d

Change-Id: Id9fa374c3f979f39fb32a1d82c9e2d18e38b0efa

update_verifier/Android.mk

diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 5d118f8..090db99 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -20,14 +20,7 @@
 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

update_verifier/update_verifier.cpp

diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index e97a3ad..93ac605 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 @@
     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);
 
-  if (is_successful == BoolResult::FALSE) {
+  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 == 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 @@
       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.";