PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update_verifier: Log to logd instead of kernel log.

Browse Source 
logd already gets started before we call update_verifier.

Bug: 26039641
Change-Id: If00669a77bf9a6e5534e33f4e50b42eabba2667a
This commit is contained in:
Tao Bao
2015-12-07 17:04:58 -08:00
parent 1171d3a12b
commit 45eac58ef1
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_verifier/Android.mk
+1 -1
View File
@@ -19,6 +19,6 @@ include $(CLEAR_VARS)
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES := update_verifier.cpp LOCAL_SRC_FILES := update_verifier.cpp
LOCAL_MODULE := update_verifier LOCAL_MODULE := update_verifier
LOCAL_SHARED_LIBRARIES := libcutils libhardware LOCAL_SHARED_LIBRARIES := libhardware liblog
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
update_verifier/update_verifier.cpp
+7 -11
View File
@@ -32,25 +32,21 @@
* A/B OTA package format in place. * A/B OTA package format in place.
*/ */
#include <cutils/klog.h>
#include <string.h> #include <string.h>
#include <hardware/boot_control.h> #include <hardware/boot_control.h>
#define LOG_TAG "update_verifier" #define LOG_TAG "update_verifier"
#define INFO(x...) KLOG_INFO(LOG_TAG, x) #include <log/log.h>
#define ERROR(x...) KLOG_ERROR(LOG_TAG, x)
int main(int argc, char** argv) { int main(int argc, char** argv) {
klog_init();
klog_set_level(6);
for (int i = 1; i < argc; i++) { 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; const hw_module_t* hw_module;
if (hw_get_module("bootctrl", &hw_module) != 0) { if (hw_get_module("bootctrl", &hw_module) != 0) {
ERROR("Error getting bootctrl module.\n"); SLOGE("Error getting bootctrl module.\n");
return -1; return -1;
} }
@@ -60,7 +56,7 @@ int main(int argc, char** argv) {
unsigned current_slot = module->getCurrentSlot(module); unsigned current_slot = module->getCurrentSlot(module);
int bootable = module->isSlotBootable(module, current_slot); 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) { if (bootable == 0) {
// The current slot has not booted successfully. // The current slot has not booted successfully.
@@ -73,12 +69,12 @@ int main(int argc, char** argv) {
int ret = module->markBootSuccessful(module); int ret = module->markBootSuccessful(module);
if (ret != 0) { if (ret != 0) {
ERROR("Error marking booted successfully: %s\n", strerror(-ret)); SLOGE("Error marking booted successfully: %s\n", strerror(-ret));
return -1; 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; return 0;
} }