From 2673cec07a4740f86438b50cfe1b70b258a9a8c8 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Tue, 2 Apr 2013 20:22:16 +0000 Subject: Move all AOSP code out of recovery binary Improves license compatibility between GPL and Apache Change-Id: I2b165aa575bb6213af6b07936f99610c113443f0 --- gui/resources.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gui/resources.cpp') diff --git a/gui/resources.cpp b/gui/resources.cpp index 2f2ea95b0..aaa153303 100644 --- a/gui/resources.cpp +++ b/gui/resources.cpp @@ -21,9 +21,8 @@ #include extern "C" { -#include "../common.h" +#include "../twcommon.h" #include "../minuitwrp/minui.h" -#include "../recovery_ui.h" } #include "rapidxml.hpp" @@ -207,9 +206,9 @@ ResourceManager::ResourceManager(xml_node<>* resList, ZipArchive* pZip) if (!attr_name) { std::string res_name = attr_name->value(); - LOGE("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); + LOGERR("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); } else - LOGE("Resource type (%s) failed to load\n", type.c_str()); + LOGERR("Resource type (%s) failed to load\n", type.c_str()); delete res; } @@ -227,9 +226,9 @@ ResourceManager::ResourceManager(xml_node<>* resList, ZipArchive* pZip) if (!attr_name) { std::string res_name = attr_name->value(); - LOGE("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); + LOGERR("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); } else - LOGE("Resource type (%s) failed to load\n", type.c_str()); + LOGERR("Resource type (%s) failed to load\n", type.c_str()); delete res; } @@ -247,9 +246,9 @@ ResourceManager::ResourceManager(xml_node<>* resList, ZipArchive* pZip) if (!attr_name) { std::string res_name = attr_name->value(); - LOGE("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); + LOGERR("Resource (%s)-(%s) failed to load\n", type.c_str(), res_name.c_str()); } else - LOGE("Resource type (%s) failed to load\n", type.c_str()); + LOGERR("Resource type (%s) failed to load\n", type.c_str()); delete res; } @@ -260,7 +259,7 @@ ResourceManager::ResourceManager(xml_node<>* resList, ZipArchive* pZip) } else { - LOGE("Resource type (%s) not supported.\n", type.c_str()); + LOGERR("Resource type (%s) not supported.\n", type.c_str()); } child = child->next_sibling("resource"); -- cgit v1.2.3