diff --git a/frameworks/bundle_lite/src/bundle_callback.cpp b/frameworks/bundle_lite/src/bundle_callback.cpp index fa76c9f17b8630f222c7a83daf798b1a4375a7a4..7f02dd36504456a5267c924515195250a19b553e 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 4cd86d185647f853f9650b7ecab749a5acdb2ee3..6822a7dbafe558e3f5fe8a341f59f76174c51a12 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 6311788094c7c538d4b693feb27cffe09fd26bc8..d9eb82a88bf086ac202879fdc7bd09fc778204b3 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 78b34251b21e3f171f64b4c8e8c5a6b952e6e62a..d63615020a9708bd647200b1729306a8ef5dfea7 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 c5601d4614074ea9c2198a3590987602bf19f936..3638b1531b635c9cff2c36f6f816764f6c22989d 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 69f82234ad254fbf204bb33c0e34e022368b4250..ec3a1d674b7aa164ee77d0b9d4d074d81c2cca21 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 29c3c172c76c3eaef868cc3ed90a5232ae4158b1..a95a6313f43b0d2804f07967a9319d83df9d7bf8 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 878c1ee60ad5908a36d51a18132e4de6ef15510c..fa266e4e93318dec8b7a0c8b7ebf28ea93b57142 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 cf8b6be0d68c3504c27148fb4de7b5ddadb4a025..c902c12f7e452d9864a99c5ec183b8b2dab9d12e 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 77007b7f3ad48cfe29fcc487043bb8087be86212..fd5bf03e648dce27994dd644fcd5806804913c21 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 6d6b10bce7601c63c9419a47264cbe854011b073..b8412f6abea88a5c2c2fca8965295f2cc3a6d6fb 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 6a95f3b48cfb6def769cfcf0b9f947109dd7af1c..3fdee4a437e433f05fd27c6eaf603952033f4c79 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 5a2f84af0e0b63ec5be3dec2ce7e20dcb870fc98..530b7744930ae2877bc8daad8eeed5f7234874d6 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 067ca99b9b7698d6945248a6888e3ac3c19507d6..99c34c4f24b9a9496daa19110bd3c5e32d6053c5 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 989571333090c1f753fb5cf0d230c6fb076fb8f7..d06e10b0b6e6ec9b2fd1bef53face8d4f4f119f2 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 785987a93eb27bf3d987a08534093e44c046d650..b6398296745079c30006b6baa57648a18942085c 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 cc329ccb4a42b7de05ed6261782cb52928357eee..304b6061eeed87ad6715f7846963bb0ef4906349 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