commit 7b0ad9c638176dc364dabb65b363536055a0ea9c
author Tianjie Xu <xunchang@google.com> Fri Aug 05 18:00:04 2016 -0700
committer Tianjie Xu <xunchang@google.com> Thu Sep 01 18:33:25 2016 +0000
tree 73848b33067169c72788f517063c3d9659e783c0
parent 818394869d36b9db1bf4984585a062d4bb91310f

Switch recovery to libbase logging

Clean up the recovery image and switch to libbase logging.

Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
Merged-In: Icd999c3cc832f0639f204b5c36cea8afe303ad35

update_verifier/Android.mk

diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 7f28bce..ed61c7b 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -19,6 +19,6 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := update_verifier.cpp
 LOCAL_MODULE := update_verifier
-LOCAL_SHARED_LIBRARIES := libhardware liblog
+LOCAL_SHARED_LIBRARIES := libhardware libbase
 
 include $(BUILD_EXECUTABLE)

update_verifier/update_verifier.cpp

diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index be70cec..0a040c5 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -35,19 +35,17 @@
 
 #include <string.h>
 
+#include <android-base/logging.h>
 #include <hardware/boot_control.h>
 
-#define LOG_TAG       "update_verifier"
-#include <log/log.h>
-
 int main(int argc, char** argv) {
   for (int i = 1; i < argc; i++) {
-    SLOGI("Started with arg %d: %s\n", i, argv[i]);
+    LOG(INFO) << "Started with arg " << i << ": " << argv[i];
   }
 
   const hw_module_t* hw_module;
   if (hw_get_module("bootctrl", &hw_module) != 0) {
-    SLOGE("Error getting bootctrl module.\n");
+    LOG(ERROR) << "Error getting bootctrl module.";
     return -1;
   }
 
@@ -57,7 +55,7 @@
 
   unsigned current_slot = module->getCurrentSlot(module);
   int is_successful= module->isSlotMarkedSuccessful(module, current_slot);
-  SLOGI("Booting slot %u: isSlotMarkedSuccessful=%d\n", current_slot, is_successful);
+  LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful=" << is_successful;
 
   if (is_successful == 0) {
     // The current slot has not booted successfully.
@@ -70,12 +68,12 @@
 
     int ret = module->markBootSuccessful(module);
     if (ret != 0) {
-      SLOGE("Error marking booted successfully: %s\n", strerror(-ret));
+      LOG(ERROR) << "Error marking booted successfully: " << strerror(-ret);
       return -1;
     }
-    SLOGI("Marked slot %u as booted successfully.\n", current_slot);
+    LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";
   }
 
-  SLOGI("Leaving update_verifier.\n");
+  LOG(INFO) << "Leaving update_verifier.";
   return 0;
 }