tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
(cherry picked from commit 45eac58ef1)
This commit is contained in:
Tao Bao 2015-12-07 17:04:58 -08:00
parent 7197ee0e39
commit 740e01e2bd
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
update_verifier/Android.mk
View file

@ -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)

18
update_verifier/update_verifier.cpp
View file

@ -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;
}