From 189d11d4f35285e049c35c72c6dc6597ac60f21a Mon Sep 17 00:00:00 2001 From: shilei Date: Thu, 4 Aug 2022 17:39:21 +0800 Subject: [PATCH] modify hilog domian Signed-off-by: shilei Change-Id: Id7737ae1faebfc0b96ad4729b59190ad8e26451f --- frameworks/bundle_lite/src/bundle_callback.cpp | 2 +- frameworks/bundle_lite/src/bundle_manager.cpp | 2 +- frameworks/bundle_lite/src/bundle_self_callback.cpp | 2 +- frameworks/bundle_lite/src/convert_utils.cpp | 2 +- services/bundlemgr_lite/include/bundlems_log.h | 2 +- services/bundlemgr_lite/src/bundle_extractor.cpp | 2 +- services/bundlemgr_lite/src/bundle_info_creator.cpp | 2 +- services/bundlemgr_lite/src/bundle_inner_feature.cpp | 2 +- services/bundlemgr_lite/src/bundle_installer.cpp | 2 +- services/bundlemgr_lite/src/bundle_manager_service.cpp | 2 +- services/bundlemgr_lite/src/bundle_ms_feature.cpp | 2 +- services/bundlemgr_lite/src/bundle_ms_host.cpp | 2 +- services/bundlemgr_lite/src/bundle_parser.cpp | 2 +- services/bundlemgr_lite/src/bundle_res_transform.cpp | 2 +- services/bundlemgr_lite/src/extractor_util.cpp | 2 +- services/bundlemgr_lite/src/hap_sign_verify.cpp | 2 +- services/bundlemgr_lite/src/zip_file.cpp | 2 +- .../bundlemgr_lite/include => utils/bundle_lite}/bundle_log.h | 0 18 files changed, 17 insertions(+), 17 deletions(-) rename {services/bundlemgr_lite/include => utils/bundle_lite}/bundle_log.h (100%) diff --git a/frameworks/bundle_lite/src/bundle_callback.cpp b/frameworks/bundle_lite/src/bundle_callback.cpp index fa76c9f..7f02dd3 100644 --- a/frameworks/bundle_lite/src/bundle_callback.cpp +++ b/frameworks/bundle_lite/src/bundle_callback.cpp @@ -20,7 +20,7 @@ #include "bundle_inner_interface.h" #include "bundle_manager.h" #include "iproxy_client.h" -#include "log.h" +#include "bundle_log.h" #include "ohos_types.h" #include "samgr_lite.h" #include "rpc_errno.h" diff --git a/frameworks/bundle_lite/src/bundle_manager.cpp b/frameworks/bundle_lite/src/bundle_manager.cpp index 4cd86d1..6822a7d 100644 --- a/frameworks/bundle_lite/src/bundle_manager.cpp +++ b/frameworks/bundle_lite/src/bundle_manager.cpp @@ -24,7 +24,7 @@ #include "convert_utils.h" #include "iproxy_client.h" #include "ipc_skeleton.h" -#include "log.h" +#include "bundle_log.h" #include "ohos_types.h" #include "pms_interface.h" #include "samgr_lite.h" diff --git a/frameworks/bundle_lite/src/bundle_self_callback.cpp b/frameworks/bundle_lite/src/bundle_self_callback.cpp index 6311788..d9eb82a 100644 --- a/frameworks/bundle_lite/src/bundle_self_callback.cpp +++ b/frameworks/bundle_lite/src/bundle_self_callback.cpp @@ -19,7 +19,7 @@ #include "bundle_callback_utils.h" #include "bundle_manager.h" #include "iproxy_client.h" -#include "log.h" +#include "bundle_log.h" #include "samgr_lite.h" #include "rpc_errno.h" diff --git a/frameworks/bundle_lite/src/convert_utils.cpp b/frameworks/bundle_lite/src/convert_utils.cpp index 78b3425..d636150 100755 --- a/frameworks/bundle_lite/src/convert_utils.cpp +++ b/frameworks/bundle_lite/src/convert_utils.cpp @@ -17,7 +17,7 @@ #include "ability_info_utils.h" #include "bundle_info_utils.h" -#include "log.h" +#include "bundle_log.h" #include "module_info_utils.h" #include "securec.h" #include "utils.h" diff --git a/services/bundlemgr_lite/include/bundlems_log.h b/services/bundlemgr_lite/include/bundlems_log.h index c5601d4..3638b15 100755 --- a/services/bundlemgr_lite/include/bundlems_log.h +++ b/services/bundlemgr_lite/include/bundlems_log.h @@ -22,7 +22,7 @@ namespace OHOS { #undef LOG_TAG #define LOG_TAG "bundlems" #undef LOG_DOMAIN -#define LOG_DOMAIN 0xD001300 +#define LOG_DOMAIN 0xD001100 #ifdef __LITEOS_M__ #ifndef HILOG_DEBUG diff --git a/services/bundlemgr_lite/src/bundle_extractor.cpp b/services/bundlemgr_lite/src/bundle_extractor.cpp index 69f8223..ec3a1d6 100755 --- a/services/bundlemgr_lite/src/bundle_extractor.cpp +++ b/services/bundlemgr_lite/src/bundle_extractor.cpp @@ -21,7 +21,7 @@ #include "bundle_common.h" #include "bundle_util.h" #include "extractor_util.h" -#include "log.h" +#include "bundle_log.h" namespace OHOS { uint8_t BundleExtractor::ExtractHapProfile(const std::string &hapFile, std::ostringstream &profileStream) diff --git a/services/bundlemgr_lite/src/bundle_info_creator.cpp b/services/bundlemgr_lite/src/bundle_info_creator.cpp index 29c3c17..a95a631 100755 --- a/services/bundlemgr_lite/src/bundle_info_creator.cpp +++ b/services/bundlemgr_lite/src/bundle_info_creator.cpp @@ -21,7 +21,7 @@ #include "bundle_manager_service.h" #include "bundle_res_transform.h" #include "bundle_util.h" -#include "log.h" +#include "bundle_log.h" #include "module_info_utils.h" #include "securec.h" #include "utils.h" diff --git a/services/bundlemgr_lite/src/bundle_inner_feature.cpp b/services/bundlemgr_lite/src/bundle_inner_feature.cpp index 878c1ee..fa266e4 100644 --- a/services/bundlemgr_lite/src/bundle_inner_feature.cpp +++ b/services/bundlemgr_lite/src/bundle_inner_feature.cpp @@ -23,7 +23,7 @@ #include "bundle_message_id.h" #include "convert_utils.h" #include "ipc_skeleton.h" -#include "log.h" +#include "bundle_log.h" #include "message.h" #include "ohos_init.h" #include "samgr_lite.h" diff --git a/services/bundlemgr_lite/src/bundle_installer.cpp b/services/bundlemgr_lite/src/bundle_installer.cpp index cf8b6be..c902c12 100755 --- a/services/bundlemgr_lite/src/bundle_installer.cpp +++ b/services/bundlemgr_lite/src/bundle_installer.cpp @@ -28,7 +28,7 @@ #include "bundle_parser.h" #include "bundle_res_transform.h" #include "bundle_util.h" -#include "log.h" +#include "bundle_log.h" #include "utils.h" namespace OHOS { diff --git a/services/bundlemgr_lite/src/bundle_manager_service.cpp b/services/bundlemgr_lite/src/bundle_manager_service.cpp index 77007b7..fd5bf03 100644 --- a/services/bundlemgr_lite/src/bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/bundle_manager_service.cpp @@ -41,7 +41,7 @@ extern "C" { #include "bundle_util.h" #include "ipc_skeleton.h" #include "rpc_errno.h" -#include "log.h" +#include "bundle_log.h" #include "samgr_lite.h" #include "utils.h" #include "want.h" diff --git a/services/bundlemgr_lite/src/bundle_ms_feature.cpp b/services/bundlemgr_lite/src/bundle_ms_feature.cpp index 6d6b10b..b8412f6 100644 --- a/services/bundlemgr_lite/src/bundle_ms_feature.cpp +++ b/services/bundlemgr_lite/src/bundle_ms_feature.cpp @@ -23,7 +23,7 @@ #include "bundle_message_id.h" #include "convert_utils.h" #include "ipc_skeleton.h" -#include "log.h" +#include "bundle_log.h" #include "message.h" #include "ohos_init.h" #include "samgr_lite.h" diff --git a/services/bundlemgr_lite/src/bundle_ms_host.cpp b/services/bundlemgr_lite/src/bundle_ms_host.cpp index 6a95f3b..3fdee4a 100755 --- a/services/bundlemgr_lite/src/bundle_ms_host.cpp +++ b/services/bundlemgr_lite/src/bundle_ms_host.cpp @@ -19,7 +19,7 @@ #include "bundle_inner_interface.h" #include "bundle_manager_service.h" -#include "log.h" +#include "bundle_log.h" #include "ohos_init.h" #include "samgr_lite.h" diff --git a/services/bundlemgr_lite/src/bundle_parser.cpp b/services/bundlemgr_lite/src/bundle_parser.cpp index 5a2f84a..530b774 100755 --- a/services/bundlemgr_lite/src/bundle_parser.cpp +++ b/services/bundlemgr_lite/src/bundle_parser.cpp @@ -19,7 +19,7 @@ #include "bundle_extractor.h" #include "bundle_info_creator.h" #include "bundle_util.h" -#include "log.h" +#include "bundle_log.h" #include "samgr_lite.h" #include "securec.h" #include "utils.h" diff --git a/services/bundlemgr_lite/src/bundle_res_transform.cpp b/services/bundlemgr_lite/src/bundle_res_transform.cpp index 067ca99..99c34c4 100755 --- a/services/bundlemgr_lite/src/bundle_res_transform.cpp +++ b/services/bundlemgr_lite/src/bundle_res_transform.cpp @@ -20,7 +20,7 @@ #include "bundle_info_utils.h" #include "bundle_util.h" #include "global.h" -#include "log.h" +#include "bundle_log.h" #include "module_info_utils.h" namespace OHOS { diff --git a/services/bundlemgr_lite/src/extractor_util.cpp b/services/bundlemgr_lite/src/extractor_util.cpp index 9895713..d06e10b 100755 --- a/services/bundlemgr_lite/src/extractor_util.cpp +++ b/services/bundlemgr_lite/src/extractor_util.cpp @@ -21,7 +21,7 @@ #include #include -#include "log.h" +#include "bundle_log.h" namespace OHOS { ExtractorUtil::ExtractorUtil(const std::string &filePath) : zipFile_(filePath) {} diff --git a/services/bundlemgr_lite/src/hap_sign_verify.cpp b/services/bundlemgr_lite/src/hap_sign_verify.cpp index 785987a..b639829 100644 --- a/services/bundlemgr_lite/src/hap_sign_verify.cpp +++ b/services/bundlemgr_lite/src/hap_sign_verify.cpp @@ -17,7 +17,7 @@ #include "appexecfwk_errors.h" #include "bundle_manager_service.h" -#include "log.h" +#include "bundle_log.h" namespace OHOS { uint8_t HapSignVerify::VerifySignature(const std::string &hapFilepath, SignatureInfo &signatureInfo) diff --git a/services/bundlemgr_lite/src/zip_file.cpp b/services/bundlemgr_lite/src/zip_file.cpp index cc329cc..304b606 100755 --- a/services/bundlemgr_lite/src/zip_file.cpp +++ b/services/bundlemgr_lite/src/zip_file.cpp @@ -20,7 +20,7 @@ #include #include -#include "log.h" +#include "bundle_log.h" #include "securec.h" #include "zlib.h" diff --git a/services/bundlemgr_lite/include/bundle_log.h b/utils/bundle_lite/bundle_log.h similarity index 100% rename from services/bundlemgr_lite/include/bundle_log.h rename to utils/bundle_lite/bundle_log.h -- Gitee