From 45eac58ef188679f6df2d80efc0391c6d7904cd8 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Mon, 7 Dec 2015 17:04:58 -0800
Subject: update_verifier: Log to logd instead of kernel log.

logd already gets started before we call update_verifier.

Bug: 26039641
Change-Id: If00669a77bf9a6e5534e33f4e50b42eabba2667a
---
 update_verifier/Android.mk          |  2 +-
 update_verifier/update_verifier.cpp | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 0bb054777..7f28bcedc 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -19,6 +19,6 @@ include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := update_verifier.cpp
 LOCAL_MODULE := update_verifier
-LOCAL_SHARED_LIBRARIES := libcutils libhardware
+LOCAL_SHARED_LIBRARIES := libhardware liblog
 
 include $(BUILD_EXECUTABLE)
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index 9ba792b86..5e8881571 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -32,25 +32,21 @@
  * A/B OTA package format in place.
  */
 
-#include <cutils/klog.h>
 #include <string.h>
 
 #include <hardware/boot_control.h>
 
 #define LOG_TAG       "update_verifier"
-#define INFO(x...)    KLOG_INFO(LOG_TAG, x)
-#define ERROR(x...)   KLOG_ERROR(LOG_TAG, x)
+#include <log/log.h>
 
 int main(int argc, char** argv) {
-  klog_init();
-  klog_set_level(6);
   for (int i = 1; i < argc; i++) {
-    INFO("Started with arg %d: %s\n", i, argv[i]);
+    SLOGI("Started with arg %d: %s\n", i, argv[i]);
   }
 
   const hw_module_t* hw_module;
   if (hw_get_module("bootctrl", &hw_module) != 0) {
-    ERROR("Error getting bootctrl module.\n");
+    SLOGE("Error getting bootctrl module.\n");
     return -1;
   }
 
@@ -60,7 +56,7 @@ int main(int argc, char** argv) {
 
   unsigned current_slot = module->getCurrentSlot(module);
   int bootable = module->isSlotBootable(module, current_slot);
-  INFO("Booting slot %u: isSlotBootable=%d\n", current_slot, bootable);
+  SLOGI("Booting slot %u: isSlotBootable=%d\n", current_slot, bootable);
 
   if (bootable == 0) {
     // The current slot has not booted successfully.
@@ -73,12 +69,12 @@ int main(int argc, char** argv) {
 
     int ret = module->markBootSuccessful(module);
     if (ret != 0) {
-      ERROR("Error marking booted successfully: %s\n", strerror(-ret));
+      SLOGE("Error marking booted successfully: %s\n", strerror(-ret));
       return -1;
     }
-    INFO("Marked slot %u as booted successfully.\n", current_slot);
+    SLOGI("Marked slot %u as booted successfully.\n", current_slot);
   }
 
-  INFO("Leaving update_verifier.\n");
+  SLOGI("Leaving update_verifier.\n");
   return 0;
 }
-- 
cgit v1.2.3