From b4aae861e0a8ba605741c9c657d9c9edd149d5ab Mon Sep 17 00:00:00 2001 From: XKK Date: Thu, 18 Jul 2024 09:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4hilog=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: XKK --- frameworks/cj/ffi/cj_ability_delegator.cpp | 1 - frameworks/cj/ffi/cj_application_context.cpp | 1 - frameworks/cj/ffi/cj_element_name_ffi.cpp | 1 - frameworks/cj/ffi/cj_utils_ffi.cpp | 1 - frameworks/cj/ffi/cj_want_ffi.cpp | 1 - .../js_ability_auto_startup_callback.cpp | 1 - .../js_ability_auto_startup_manager_utils.h | 1 - .../js_ability_auto_startup_manager.cpp | 1 - .../js/napi/app_startup/startup_manager/js_startup_manager.cpp | 1 - frameworks/js/napi/auto_fill_manager/js_auto_fill_manager.cpp | 1 - .../js/napi/auto_fill_manager/js_auto_save_request_callback.cpp | 1 - .../napi_common/open_link/napi_common_open_link_options.cpp | 1 - .../js/napi/insight_intent/insight_intent/js_insight_intent.cpp | 1 - .../insight_intent_driver/js_insight_intent_driver.cpp | 1 - .../insight_intent_driver/js_insight_intent_driver_utils.cpp | 1 - .../napi/js_child_process_manager/js_child_process_manager.cpp | 1 - frameworks/js/napi/js_dialog_session/js_dialog_session.cpp | 1 - .../js/napi/js_dialog_session/js_dialog_session_utils.cpp | 1 - .../ability/ability_runtime/dialog_ui_extension_callback.cpp | 1 - .../ability_runtime/cj_ability_connect_callback_object.cpp | 1 - .../ability/native/ability_runtime/cj_ability_context.cpp | 1 - .../native/ability_runtime/cj_ability_context_object.cpp | 1 - .../native/ability/native/ability_runtime/cj_ability_ffi.cpp | 1 - .../native/ability/native/ability_runtime/cj_ability_object.cpp | 1 - .../native/ability/native/ability_runtime/cj_ui_ability.cpp | 1 - .../native/action_extension_ability/action_extension.cpp | 1 - .../action_extension_ability/action_extension_module_loader.cpp | 1 - .../native/action_extension_ability/js_action_extension.cpp | 1 - .../native/auto_fill_extension_ability/auto_fill_extension.cpp | 1 - .../auto_fill_extension_ability/auto_fill_extension_context.cpp | 1 - .../auto_fill_extension_module_loader.cpp | 1 - .../auto_fill_extension_ability/js_auto_fill_extension.cpp | 1 - .../js_auto_fill_extension_context.cpp | 1 - .../auto_fill_extension_ability/js_auto_fill_extension_util.cpp | 1 - .../auto_fill_extension_ability/js_fill_request_callback.cpp | 1 - .../auto_fill_extension_ability/js_save_request_callback.cpp | 1 - .../native/ability/native/auto_startup_callback_proxy.cpp | 1 - frameworks/native/ability/native/auto_startup_callback_stub.cpp | 1 - .../native/child_process_manager/child_process_manager.cpp | 1 - .../ability/native/child_process_manager/js_child_process.cpp | 1 - .../native/child_process_manager/native_child_ipc_process.cpp | 1 - .../continuation/distributed/continuation_handler_stage.cpp | 1 - .../continuation/distributed/continuation_manager_stage.cpp | 1 - .../reverse_continuation_scheduler_primary_stage.cpp | 1 - .../embedded_ui_extension_ability/embedded_ui_extension.cpp | 1 - .../embedded_ui_extension_module_loader.cpp | 1 - .../embedded_ui_extension_ability/js_embedded_ui_extension.cpp | 1 - frameworks/native/ability/native/extension_ability_thread.cpp | 1 - frameworks/native/ability/native/fa_ability_thread.cpp | 1 - .../native/insight_intent_executor/insight_intent_executor.cpp | 1 - .../insight_intent_executor/insight_intent_executor_mgr.cpp | 1 - .../insight_intent_executor/js_insight_intent_executor.cpp | 1 - frameworks/native/ability/native/insight_intent_host_client.cpp | 1 - frameworks/native/ability/native/js_ui_extension_callback.cpp | 1 - .../native/share_extension_ability/js_share_extension.cpp | 1 - .../ability/native/share_extension_ability/share_extension.cpp | 1 - .../share_extension_ability/share_extension_module_loader.cpp | 1 - frameworks/native/ability/native/ui_ability_impl.cpp | 1 - frameworks/native/ability/native/ui_ability_thread.cpp | 1 - .../ui_extension_ability/js_embeddable_ui_ability_context.cpp | 1 - .../native/ui_extension_ability/js_ui_extension_base.cpp | 1 - .../ui_extension_ability/js_ui_extension_content_session.cpp | 1 - .../native/appkit/ability_runtime/app/cj_ability_stage.cpp | 1 - .../appkit/ability_runtime/app/cj_ability_stage_context.cpp | 1 - .../appkit/ability_runtime/app/cj_ability_stage_object.cpp | 1 - .../context/application_state_change_callback.cpp | 1 - .../appkit/ability_runtime/ui_service_extension_context.cpp | 1 - frameworks/native/appkit/app/application_cleaner.cpp | 1 - frameworks/native/appkit/app/assert_fault_callback.cpp | 1 - frameworks/native/appkit/app/assert_fault_task_thread.cpp | 1 - frameworks/native/appkit/app/child_main_thread.cpp | 1 - frameworks/native/appkit/app/dump_runtime_helper.cpp | 1 - frameworks/native/appkit/app/extension_plugin_info.cpp | 1 - frameworks/native/appkit/app_startup/js_startup_config.cpp | 1 - frameworks/native/appkit/app_startup/js_startup_task.cpp | 1 - .../native/appkit/app_startup/js_startup_task_executor.cpp | 1 - frameworks/native/appkit/app_startup/startup_manager.cpp | 1 - frameworks/native/appkit/app_startup/startup_task.cpp | 1 - .../native/appkit/app_startup/startup_task_dispatcher.cpp | 1 - frameworks/native/appkit/app_startup/startup_task_manager.cpp | 1 - frameworks/native/appkit/app_startup/startup_task_result.cpp | 1 - frameworks/native/appkit/dfr/appfreeze_inner.cpp | 1 - frameworks/native/appkit/dfr/appfreeze_state.cpp | 1 - frameworks/native/appkit/dfr/watchdog.cpp | 1 - frameworks/native/child_process/src/native_child_callback.cpp | 1 - frameworks/native/child_process/src/native_child_process.cpp | 1 - .../insight_intent_context/insight_intent_context.cpp | 1 - .../insight_intent_context/js_insight_intent_context.cpp | 1 - .../ability_simulator/include/bundle_parser/json_util.h | 1 - frameworks/simulator/ability_simulator/src/ability_context.cpp | 1 - .../simulator/ability_simulator/src/ability_stage_context.cpp | 1 - .../ability_simulator/src/bundle_parser/ability_info.cpp | 1 - .../ability_simulator/src/bundle_parser/application_info.cpp | 1 - .../ability_simulator/src/bundle_parser/bundle_container.cpp | 1 - .../src/bundle_parser/extension_ability_info.cpp | 1 - .../ability_simulator/src/bundle_parser/hap_module_info.cpp | 1 - .../ability_simulator/src/bundle_parser/module_info.cpp | 1 - frameworks/simulator/ability_simulator/src/common_func.cpp | 1 - .../simulator/ability_simulator/src/js_ability_context.cpp | 1 - .../ability_simulator/src/js_ability_stage_context.cpp | 1 - .../ability_simulator/src/js_application_context_utils.cpp | 1 - frameworks/simulator/ability_simulator/src/js_console_log.cpp | 1 - frameworks/simulator/ability_simulator/src/js_context_utils.cpp | 1 - .../simulator/ability_simulator/src/js_data_converter.cpp | 1 - frameworks/simulator/ability_simulator/src/js_runtime_utils.cpp | 1 - .../napi_module/ability_constant/ability_constant_module.cpp | 1 - .../src/ability_foreground_state_observer_proxy.cpp | 1 - .../src/ability_foreground_state_observer_stub.cpp | 1 - .../app_manager/src/appmgr/ability_debug_response_proxy.cpp | 1 - .../app_manager/src/appmgr/ability_debug_response_stub.cpp | 1 - .../src/appmgr/ability_foreground_state_observer_proxy.cpp | 1 - .../src/appmgr/ability_foreground_state_observer_stub.cpp | 1 - interfaces/inner_api/app_manager/src/appmgr/app_debug_info.cpp | 1 - .../app_manager/src/appmgr/app_debug_listener_proxy.cpp | 1 - .../app_manager/src/appmgr/app_debug_listener_stub.cpp | 1 - .../src/appmgr/app_foreground_state_observer_proxy.cpp | 1 - .../src/appmgr/app_foreground_state_observer_stub.cpp | 1 - .../inner_api/app_manager/src/appmgr/app_jsheap_mem_info.cpp | 1 - .../app_manager/src/appmgr/app_running_status_proxy.cpp | 1 - .../app_manager/src/appmgr/app_running_status_stub.cpp | 1 - .../inner_api/app_manager/src/appmgr/child_scheduler_proxy.cpp | 1 - .../inner_api/app_manager/src/appmgr/child_scheduler_stub.cpp | 1 - interfaces/inner_api/app_manager/src/appmgr/fault_data.cpp | 1 - .../app_manager/src/appmgr/native_child_notify_proxy.cpp | 1 - .../app_manager/src/appmgr/native_child_notify_stub.cpp | 1 - interfaces/inner_api/app_manager/src/appmgr/page_state_data.cpp | 1 - .../inner_api/app_manager/src/appmgr/render_process_info.cpp | 1 - .../inner_api/app_manager/src/appmgr/render_state_data.cpp | 1 - .../app_manager/src/appmgr/render_state_observer_proxy.cpp | 1 - .../app_manager/src/appmgr/render_state_observer_stub.cpp | 1 - .../inner_api/app_manager/src/appmgr/running_multi_info.cpp | 1 - .../inner_api/auto_fill_manager/src/auto_fill_event_handler.cpp | 1 - .../auto_fill_manager/src/auto_fill_extension_callback.cpp | 1 - .../inner_api/auto_fill_manager/src/auto_fill_manager.cpp | 1 - .../inner_api/auto_fill_manager/src/auto_fill_manager_util.cpp | 1 - .../extension_manager/src/extension_manager_client.cpp | 1 - .../inner_api/extension_manager/src/extension_manager_proxy.cpp | 1 - .../inner_api/session_handler/src/session_handler_proxy.cpp | 1 - .../inner_api/session_handler/src/session_handler_stub.cpp | 1 - .../ability/native/ability_runtime/cj_ability_context_object.h | 1 - .../distributed_ability_runtime/distributed_parcel_helper.h | 1 - .../appkit/ability_runtime/app/cj_ability_stage_context.h | 1 - .../kits/native/appkit/app_startup/startup_topologysort.h | 1 - services/abilitymgr/include/app_gallery_enable_util.h | 1 - services/abilitymgr/src/ability_auto_startup_client.cpp | 1 - services/abilitymgr/src/ability_auto_startup_data_manager.cpp | 1 - services/abilitymgr/src/ability_auto_startup_service.cpp | 1 - services/abilitymgr/src/ability_background_connection.cpp | 1 - services/abilitymgr/src/ability_manager_collaborator_proxy.cpp | 1 - services/abilitymgr/src/ability_manager_event_subscriber.cpp | 1 - services/abilitymgr/src/app_exit_reason_data_manager.cpp | 1 - services/abilitymgr/src/app_exit_reason_helper.cpp | 1 - .../abilitymgr/src/app_recovery/default_recovery_config.cpp | 1 - services/abilitymgr/src/assert_fault_proxy.cpp | 1 - .../abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp | 1 - services/abilitymgr/src/dialog_session/dialog_session_info.cpp | 1 - .../abilitymgr/src/dialog_session/dialog_session_manager.cpp | 1 - services/abilitymgr/src/disposed_observer.cpp | 1 - .../src/ecological_rule/ability_ecological_rule_mgr_service.cpp | 1 - .../ability_ecological_rule_mgr_service_param.cpp | 1 - services/abilitymgr/src/exit_reason.cpp | 1 - services/abilitymgr/src/extension_config.cpp | 1 - services/abilitymgr/src/extension_record.cpp | 1 - services/abilitymgr/src/extension_record_manager.cpp | 1 - .../abilitymgr/src/insight_intent_execute_callback_proxy.cpp | 1 - .../abilitymgr/src/insight_intent_execute_callback_stub.cpp | 1 - services/abilitymgr/src/insight_intent_execute_manager.cpp | 1 - services/abilitymgr/src/insight_intent_execute_param.cpp | 1 - services/abilitymgr/src/insight_intent_profile.cpp | 1 - services/abilitymgr/src/insight_intent_utils.cpp | 1 - .../abilitymgr/src/interceptor/ability_interceptor_executer.cpp | 1 - .../abilitymgr/src/interceptor/ability_jump_interceptor.cpp | 1 - services/abilitymgr/src/interceptor/control_interceptor.cpp | 1 - services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp | 1 - .../abilitymgr/src/interceptor/disposed_rule_interceptor.cpp | 1 - .../abilitymgr/src/interceptor/ecological_rule_interceptor.cpp | 1 - services/abilitymgr/src/preload_uiext_state_observer.cpp | 1 - services/abilitymgr/src/process_options.cpp | 1 - services/abilitymgr/src/remote_on_listener_proxy.cpp | 1 - services/abilitymgr/src/remote_on_listener_stub.cpp | 1 - services/abilitymgr/src/restart_app_manager.cpp | 1 - .../abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp | 1 - .../start_ability_handler/start_ability_sandbox_savefile.cpp | 1 - services/abilitymgr/src/start_ability_utils.cpp | 1 - services/abilitymgr/src/ui_extension_ability_connect_info.cpp | 1 - services/abilitymgr/src/user_callback_proxy.cpp | 1 - services/abilitymgr/src/user_callback_stub.cpp | 1 - services/abilitymgr/src/utils/extension_permissions_util.cpp | 1 - services/common/include/hilog_tag_wrapper.h | 2 +- services/common/src/json_utils.cpp | 1 - services/dataobsmgr/src/dataobs_mgr_inner_pref.cpp | 1 - 191 files changed, 1 insertion(+), 191 deletions(-) diff --git a/frameworks/cj/ffi/cj_ability_delegator.cpp b/frameworks/cj/ffi/cj_ability_delegator.cpp index 739d5c6e76..c0d58d50b1 100644 --- a/frameworks/cj/ffi/cj_ability_delegator.cpp +++ b/frameworks/cj/ffi/cj_ability_delegator.cpp @@ -21,7 +21,6 @@ #include "cj_utils_ffi.h" #include "application_context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityDelegatorCJ { diff --git a/frameworks/cj/ffi/cj_application_context.cpp b/frameworks/cj/ffi/cj_application_context.cpp index 1861adb834..6dd2ab80e0 100644 --- a/frameworks/cj/ffi/cj_application_context.cpp +++ b/frameworks/cj/ffi/cj_application_context.cpp @@ -19,7 +19,6 @@ #include "application_context.h" #include "cj_utils_ffi.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace ApplicationContextCJ { diff --git a/frameworks/cj/ffi/cj_element_name_ffi.cpp b/frameworks/cj/ffi/cj_element_name_ffi.cpp index fb96009584..e86e8ff522 100644 --- a/frameworks/cj/ffi/cj_element_name_ffi.cpp +++ b/frameworks/cj/ffi/cj_element_name_ffi.cpp @@ -18,7 +18,6 @@ #include "cj_utils_ffi.h" #include "element_name.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" using OHOS::AppExecFwk::ElementName; diff --git a/frameworks/cj/ffi/cj_utils_ffi.cpp b/frameworks/cj/ffi/cj_utils_ffi.cpp index 7fcc5cf0b9..4506e5a5ac 100644 --- a/frameworks/cj/ffi/cj_utils_ffi.cpp +++ b/frameworks/cj/ffi/cj_utils_ffi.cpp @@ -18,7 +18,6 @@ #include "securec.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" char* CreateCStringFromString(const std::string& source) { diff --git a/frameworks/cj/ffi/cj_want_ffi.cpp b/frameworks/cj/ffi/cj_want_ffi.cpp index c63a032140..d45858bb7d 100644 --- a/frameworks/cj/ffi/cj_want_ffi.cpp +++ b/frameworks/cj/ffi/cj_want_ffi.cpp @@ -23,7 +23,6 @@ #include "want.h" #include "want_params_wrapper.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" using OHOS::AAFwk::Want; using OHOS::AppExecFwk::ElementName; diff --git a/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_callback.cpp b/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_callback.cpp index 1ac5ccf4ce..6bef7d671a 100644 --- a/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_callback.cpp +++ b/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_callback.cpp @@ -16,7 +16,6 @@ #include "js_ability_auto_startup_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_ability_auto_startup_manager_utils.h" #include "js_runtime.h" #include "js_runtime_utils.h" diff --git a/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_manager_utils.h b/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_manager_utils.h index db35f4e804..a5c8048f96 100644 --- a/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_manager_utils.h +++ b/frameworks/js/napi/ability_auto_startup_callback/js_ability_auto_startup_manager_utils.h @@ -17,7 +17,6 @@ #define OHOS_ABILITY_RUNTIME_JS_ABILITY_AUTO_STARTUP_MANAGER_UTILS_H #include "auto_startup_info.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "js_runtime_utils.h" #include "native_engine/native_engine.h" diff --git a/frameworks/js/napi/ability_auto_startup_manager/js_ability_auto_startup_manager.cpp b/frameworks/js/napi/ability_auto_startup_manager/js_ability_auto_startup_manager.cpp index 675e74e52f..1ee8f3b4c7 100644 --- a/frameworks/js/napi/ability_auto_startup_manager/js_ability_auto_startup_manager.cpp +++ b/frameworks/js/napi/ability_auto_startup_manager/js_ability_auto_startup_manager.cpp @@ -19,7 +19,6 @@ #include "ability_manager_interface.h" #include "auto_startup_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "js_ability_auto_startup_manager_utils.h" #include "js_error_utils.h" diff --git a/frameworks/js/napi/app_startup/startup_manager/js_startup_manager.cpp b/frameworks/js/napi/app_startup/startup_manager/js_startup_manager.cpp index a57d175f38..9c910722d1 100644 --- a/frameworks/js/napi/app_startup/startup_manager/js_startup_manager.cpp +++ b/frameworks/js/napi/app_startup/startup_manager/js_startup_manager.cpp @@ -17,7 +17,6 @@ #include "ability_runtime_error_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_startup_config.h" #include "js_startup_task_result.h" #include "napi/native_api.h" diff --git a/frameworks/js/napi/auto_fill_manager/js_auto_fill_manager.cpp b/frameworks/js/napi/auto_fill_manager/js_auto_fill_manager.cpp index c2d7b52709..229820d1fa 100644 --- a/frameworks/js/napi/auto_fill_manager/js_auto_fill_manager.cpp +++ b/frameworks/js/napi/auto_fill_manager/js_auto_fill_manager.cpp @@ -18,7 +18,6 @@ #include "ability_business_error.h" #include "auto_fill_manager.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "js_error_utils.h" diff --git a/frameworks/js/napi/auto_fill_manager/js_auto_save_request_callback.cpp b/frameworks/js/napi/auto_fill_manager/js_auto_save_request_callback.cpp index 6f9808c1ce..222937e62d 100644 --- a/frameworks/js/napi/auto_fill_manager/js_auto_save_request_callback.cpp +++ b/frameworks/js/napi/auto_fill_manager/js_auto_save_request_callback.cpp @@ -16,7 +16,6 @@ #include "js_auto_save_request_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_auto_fill_manager.h" #include "js_runtime.h" #include "js_runtime_utils.h" diff --git a/frameworks/js/napi/inner/napi_common/open_link/napi_common_open_link_options.cpp b/frameworks/js/napi/inner/napi_common/open_link/napi_common_open_link_options.cpp index 0f6c415565..a4db405e50 100644 --- a/frameworks/js/napi/inner/napi_common/open_link/napi_common_open_link_options.cpp +++ b/frameworks/js/napi/inner/napi_common/open_link/napi_common_open_link_options.cpp @@ -16,7 +16,6 @@ #include "napi_common_open_link_options.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "int_wrapper.h" #include "napi_common_util.h" #include "napi_common_want.h" diff --git a/frameworks/js/napi/insight_intent/insight_intent/js_insight_intent.cpp b/frameworks/js/napi/insight_intent/insight_intent/js_insight_intent.cpp index 7818bb932f..4562819f7d 100644 --- a/frameworks/js/napi/insight_intent/insight_intent/js_insight_intent.cpp +++ b/frameworks/js/napi/insight_intent/insight_intent/js_insight_intent.cpp @@ -16,7 +16,6 @@ #include "js_insight_intent.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_runtime_utils.h" #include "native_engine/native_value.h" diff --git a/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver.cpp b/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver.cpp index 6487a5028f..d36932ef32 100644 --- a/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver.cpp +++ b/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver.cpp @@ -20,7 +20,6 @@ #include "event_handler.h" #include "event_runner.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "insight_intent_callback_interface.h" #include "insight_intent_host_client.h" #include "insight_intent_execute_result.h" diff --git a/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver_utils.cpp b/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver_utils.cpp index 4d4e29a9c6..a1cc25c99a 100644 --- a/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver_utils.cpp +++ b/frameworks/js/napi/insight_intent/insight_intent_driver/js_insight_intent_driver_utils.cpp @@ -18,7 +18,6 @@ #include #include "ability_state.h" -#include "hilog_wrapper.h" #include "napi_common_want.h" #include "napi_remote_object.h" #include "js_runtime.h" diff --git a/frameworks/js/napi/js_child_process_manager/js_child_process_manager.cpp b/frameworks/js/napi/js_child_process_manager/js_child_process_manager.cpp index a39d6eab0a..784303014f 100644 --- a/frameworks/js/napi/js_child_process_manager/js_child_process_manager.cpp +++ b/frameworks/js/napi/js_child_process_manager/js_child_process_manager.cpp @@ -20,7 +20,6 @@ #include "child_process_manager.h" #include "child_process_manager_error_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_runtime_utils.h" #include "napi_common_child_process_param.h" diff --git a/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp b/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp index 9dc185c553..3639e9055c 100644 --- a/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp +++ b/frameworks/js/napi/js_dialog_session/js_dialog_session.cpp @@ -17,7 +17,6 @@ #include "ability_manager_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_error_utils.h" #include "napi/native_api.h" #include "napi_common_ability.h" diff --git a/frameworks/js/napi/js_dialog_session/js_dialog_session_utils.cpp b/frameworks/js/napi/js_dialog_session/js_dialog_session_utils.cpp index a67fcee65f..f2ce86c3c5 100644 --- a/frameworks/js/napi/js_dialog_session/js_dialog_session_utils.cpp +++ b/frameworks/js/napi/js_dialog_session/js_dialog_session_utils.cpp @@ -15,7 +15,6 @@ #include "js_dialog_session_utils.h" -#include "hilog_wrapper.h" #include "json/json.h" #include "napi_common_ability.h" #include "napi_common_want.h" diff --git a/frameworks/native/ability/ability_runtime/dialog_ui_extension_callback.cpp b/frameworks/native/ability/ability_runtime/dialog_ui_extension_callback.cpp index eab5c5ef8f..461372fa53 100644 --- a/frameworks/native/ability/ability_runtime/dialog_ui_extension_callback.cpp +++ b/frameworks/native/ability/ability_runtime/dialog_ui_extension_callback.cpp @@ -14,7 +14,6 @@ */ #include "dialog_ui_extension_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp index 6ac6ae3df9..ae655b18a2 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp @@ -17,7 +17,6 @@ #include "cj_remote_object_ffi.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" using namespace OHOS::AbilityRuntime; diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp index bf05e9ad3f..6c942a089e 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp @@ -17,7 +17,6 @@ #include "cj_common_ffi.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "cj_ability_connect_callback_object.h" namespace OHOS { diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp index 7f9b70ce3e..2fbe608d40 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp @@ -21,7 +21,6 @@ #include "cj_common_ffi.h" #include "ffi_remote_data.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "napi_common_start_options.h" #include "napi_common_util.h" #include "pixel_map.h" diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp index 178fbe2642..5f7d2ecfe5 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp @@ -19,7 +19,6 @@ #include "ability_runtime/cj_ability_context.h" #include "cj_common_ffi.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp index 293bf653ec..c159c74a24 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp @@ -16,7 +16,6 @@ #include "ability_runtime/cj_ability_object.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" using namespace OHOS; using namespace OHOS::AppExecFwk; diff --git a/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp b/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp index 5698ab8ff9..901fa6a19d 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp @@ -28,7 +28,6 @@ #include "connection_manager.h" #include "context/context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "if_system_ability_manager.h" #include "insight_intent_executor_info.h" diff --git a/frameworks/native/ability/native/action_extension_ability/action_extension.cpp b/frameworks/native/ability/native/action_extension_ability/action_extension.cpp index d105b87a61..a215c35ef5 100644 --- a/frameworks/native/ability/native/action_extension_ability/action_extension.cpp +++ b/frameworks/native/ability/native/action_extension_ability/action_extension.cpp @@ -16,7 +16,6 @@ #include "action_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_action_extension.h" #include "runtime.h" #include "ui_extension_context.h" diff --git a/frameworks/native/ability/native/action_extension_ability/action_extension_module_loader.cpp b/frameworks/native/ability/native/action_extension_ability/action_extension_module_loader.cpp index 601479fe7d..7d56618dde 100644 --- a/frameworks/native/ability/native/action_extension_ability/action_extension_module_loader.cpp +++ b/frameworks/native/ability/native/action_extension_ability/action_extension_module_loader.cpp @@ -17,7 +17,6 @@ #include "action_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/action_extension_ability/js_action_extension.cpp b/frameworks/native/ability/native/action_extension_ability/js_action_extension.cpp index c8b7efcb52..5b6f8ec78c 100644 --- a/frameworks/native/ability/native/action_extension_ability/js_action_extension.cpp +++ b/frameworks/native/ability/native/action_extension_ability/js_action_extension.cpp @@ -16,7 +16,6 @@ #include "js_action_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "js_ui_extension_base.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension.cpp index 1432515aeb..0051c18941 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension.cpp @@ -17,7 +17,6 @@ #include "auto_fill_extension_context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_auto_fill_extension.h" #include "runtime.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_context.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_context.cpp index 2bb7308782..63c866f427 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_context.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_context.cpp @@ -16,7 +16,6 @@ #include "auto_fill_extension_context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_module_loader.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_module_loader.cpp index 115114b2b6..812155a1d1 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_module_loader.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/auto_fill_extension_module_loader.cpp @@ -17,7 +17,6 @@ #include "auto_fill_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension.cpp index 4b853d6d71..f35f42e673 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension.cpp @@ -24,7 +24,6 @@ #include "context.h" #include "hitrace_meter.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "int_wrapper.h" #include "js_auto_fill_extension_util.h" #include "js_auto_fill_extension_context.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_context.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_context.cpp index f6f9ebe2a2..b69ed11808 100755 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_context.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_context.cpp @@ -16,7 +16,6 @@ #include "js_auto_fill_extension_context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_error_utils.h" #include "js_extension_context.h" #include "napi/native_api.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_util.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_util.cpp index 50375fb8af..9d210f1535 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_util.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_auto_fill_extension_util.cpp @@ -16,7 +16,6 @@ #include "js_auto_fill_extension_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "napi_common_util.h" #include "napi_common_want.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp index 58dad8ac82..20504aadf3 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp @@ -18,7 +18,6 @@ #include "ability_manager_client.h" #include "accesstoken_kit.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "int_wrapper.h" #include "ipc_skeleton.h" #include "js_auto_fill_extension_util.h" diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_save_request_callback.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_save_request_callback.cpp index d8ce65a4a8..59a29b8bd0 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_save_request_callback.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_save_request_callback.cpp @@ -18,7 +18,6 @@ #include "ability_manager_client.h" #include "accesstoken_kit.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_auto_fill_extension_util.h" #include "js_error_utils.h" #include "js_runtime_utils.h" diff --git a/frameworks/native/ability/native/auto_startup_callback_proxy.cpp b/frameworks/native/ability/native/auto_startup_callback_proxy.cpp index 8117160aa5..e3aa9cbe36 100644 --- a/frameworks/native/ability/native/auto_startup_callback_proxy.cpp +++ b/frameworks/native/ability/native/auto_startup_callback_proxy.cpp @@ -17,7 +17,6 @@ #include "ability_manager_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/frameworks/native/ability/native/auto_startup_callback_stub.cpp b/frameworks/native/ability/native/auto_startup_callback_stub.cpp index f8219d26cd..fe00f83d99 100644 --- a/frameworks/native/ability/native/auto_startup_callback_stub.cpp +++ b/frameworks/native/ability/native/auto_startup_callback_stub.cpp @@ -19,7 +19,6 @@ #include "auto_startup_info.h" #include "event_handler.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/frameworks/native/ability/native/child_process_manager/child_process_manager.cpp b/frameworks/native/ability/native/child_process_manager/child_process_manager.cpp index 94ce1cbca1..7fb076d059 100644 --- a/frameworks/native/ability/native/child_process_manager/child_process_manager.cpp +++ b/frameworks/native/ability/native/child_process_manager/child_process_manager.cpp @@ -38,7 +38,6 @@ #include "errors.h" #include "hap_module_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parameters.h" #include "runtime.h" #include "sys_mgr_client.h" diff --git a/frameworks/native/ability/native/child_process_manager/js_child_process.cpp b/frameworks/native/ability/native/child_process_manager/js_child_process.cpp index 79448e967c..74a90be3f5 100644 --- a/frameworks/native/ability/native/child_process_manager/js_child_process.cpp +++ b/frameworks/native/ability/native/child_process_manager/js_child_process.cpp @@ -17,7 +17,6 @@ #include "child_process.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "js_runtime_utils.h" #include "napi_common_child_process_param.h" diff --git a/frameworks/native/ability/native/child_process_manager/native_child_ipc_process.cpp b/frameworks/native/ability/native/child_process_manager/native_child_ipc_process.cpp index 0ad1e63ce3..35144b82da 100644 --- a/frameworks/native/ability/native/child_process_manager/native_child_ipc_process.cpp +++ b/frameworks/native/ability/native/child_process_manager/native_child_ipc_process.cpp @@ -18,7 +18,6 @@ #include #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "child_process_manager_error_utils.h" namespace OHOS { diff --git a/frameworks/native/ability/native/continuation/distributed/continuation_handler_stage.cpp b/frameworks/native/ability/native/continuation/distributed/continuation_handler_stage.cpp index 4c60dbef08..2d39d9dc57 100644 --- a/frameworks/native/ability/native/continuation/distributed/continuation_handler_stage.cpp +++ b/frameworks/native/ability/native/continuation/distributed/continuation_handler_stage.cpp @@ -20,7 +20,6 @@ #include "distributed_errors.h" #include "element_name.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" using OHOS::AAFwk::WantParams; namespace OHOS { diff --git a/frameworks/native/ability/native/continuation/distributed/continuation_manager_stage.cpp b/frameworks/native/ability/native/continuation/distributed/continuation_manager_stage.cpp index 5bfc66cdc9..8d3663e376 100644 --- a/frameworks/native/ability/native/continuation/distributed/continuation_manager_stage.cpp +++ b/frameworks/native/ability/native/continuation/distributed/continuation_manager_stage.cpp @@ -21,7 +21,6 @@ #include "continuation_handler.h" #include "distributed_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "operation_builder.h" #include "string_ex.h" #include "string_wrapper.h" diff --git a/frameworks/native/ability/native/continuation/distributed/reverse_continuation_scheduler_primary_stage.cpp b/frameworks/native/ability/native/continuation/distributed/reverse_continuation_scheduler_primary_stage.cpp index 723379184d..0c933ad589 100644 --- a/frameworks/native/ability/native/continuation/distributed/reverse_continuation_scheduler_primary_stage.cpp +++ b/frameworks/native/ability/native/continuation/distributed/reverse_continuation_scheduler_primary_stage.cpp @@ -17,7 +17,6 @@ #include "continuation_handler_stage.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AppExecFwk { diff --git a/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension.cpp b/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension.cpp index c6d3beed67..c103bfa279 100644 --- a/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension.cpp +++ b/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension.cpp @@ -16,7 +16,6 @@ #include "embedded_ui_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_embedded_ui_extension.h" #include "runtime.h" #include "ui_extension_context.h" diff --git a/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension_module_loader.cpp b/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension_module_loader.cpp index af1038b5e4..2737dcee8f 100644 --- a/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension_module_loader.cpp +++ b/frameworks/native/ability/native/embedded_ui_extension_ability/embedded_ui_extension_module_loader.cpp @@ -17,7 +17,6 @@ #include "embedded_ui_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/embedded_ui_extension_ability/js_embedded_ui_extension.cpp b/frameworks/native/ability/native/embedded_ui_extension_ability/js_embedded_ui_extension.cpp index 623b330ebf..5eaf73275e 100644 --- a/frameworks/native/ability/native/embedded_ui_extension_ability/js_embedded_ui_extension.cpp +++ b/frameworks/native/ability/native/embedded_ui_extension_ability/js_embedded_ui_extension.cpp @@ -16,7 +16,6 @@ #include "js_embedded_ui_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "js_ui_extension_base.h" diff --git a/frameworks/native/ability/native/extension_ability_thread.cpp b/frameworks/native/ability/native/extension_ability_thread.cpp index 5f6b15db4e..fab6cfb75e 100644 --- a/frameworks/native/ability/native/extension_ability_thread.cpp +++ b/frameworks/native/ability/native/extension_ability_thread.cpp @@ -20,7 +20,6 @@ #include "ability_loader.h" #include "ability_manager_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "ui_extension_utils.h" diff --git a/frameworks/native/ability/native/fa_ability_thread.cpp b/frameworks/native/ability/native/fa_ability_thread.cpp index 2806d7bb78..0253f71c49 100644 --- a/frameworks/native/ability/native/fa_ability_thread.cpp +++ b/frameworks/native/ability/native/fa_ability_thread.cpp @@ -33,7 +33,6 @@ #endif // WITH_DLP #include "freeze_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "ohos_application.h" #ifdef SUPPORT_GRAPHICS diff --git a/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor.cpp b/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor.cpp index 409b9f5a03..bafc7d6ddb 100644 --- a/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor.cpp +++ b/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor.cpp @@ -17,7 +17,6 @@ #include "js_insight_intent_executor.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "runtime.h" diff --git a/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor_mgr.cpp b/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor_mgr.cpp index 6b40704ecb..e77f28518c 100644 --- a/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor_mgr.cpp +++ b/frameworks/native/ability/native/insight_intent_executor/insight_intent_executor_mgr.cpp @@ -17,7 +17,6 @@ #include "ability_business_error.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/insight_intent_executor/js_insight_intent_executor.cpp b/frameworks/native/ability/native/insight_intent_executor/js_insight_intent_executor.cpp index fdf40935f6..2c79ecec4d 100644 --- a/frameworks/native/ability/native/insight_intent_executor/js_insight_intent_executor.cpp +++ b/frameworks/native/ability/native/insight_intent_executor/js_insight_intent_executor.cpp @@ -19,7 +19,6 @@ #include "ability_transaction_callback_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "insight_intent_constant.h" #include "insight_intent_execute_result.h" #include "js_insight_intent_context.h" diff --git a/frameworks/native/ability/native/insight_intent_host_client.cpp b/frameworks/native/ability/native/insight_intent_host_client.cpp index 8a27d6cf0d..b632cbee25 100644 --- a/frameworks/native/ability/native/insight_intent_host_client.cpp +++ b/frameworks/native/ability/native/insight_intent_host_client.cpp @@ -14,7 +14,6 @@ */ #include "insight_intent_host_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/ability/native/js_ui_extension_callback.cpp b/frameworks/native/ability/native/js_ui_extension_callback.cpp index e7e835952a..d13d3c4768 100644 --- a/frameworks/native/ability/native/js_ui_extension_callback.cpp +++ b/frameworks/native/ability/native/js_ui_extension_callback.cpp @@ -15,7 +15,6 @@ #include "js_ui_extension_callback.h" #include "ability_business_error.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime_utils.h" #include "napi/native_api.h" #include "napi_common_util.h" diff --git a/frameworks/native/ability/native/share_extension_ability/js_share_extension.cpp b/frameworks/native/ability/native/share_extension_ability/js_share_extension.cpp index e691c5a801..24e0446dc3 100644 --- a/frameworks/native/ability/native/share_extension_ability/js_share_extension.cpp +++ b/frameworks/native/ability/native/share_extension_ability/js_share_extension.cpp @@ -16,7 +16,6 @@ #include "js_share_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "js_ui_extension_base.h" diff --git a/frameworks/native/ability/native/share_extension_ability/share_extension.cpp b/frameworks/native/ability/native/share_extension_ability/share_extension.cpp index eaf583ff37..c298e4a336 100644 --- a/frameworks/native/ability/native/share_extension_ability/share_extension.cpp +++ b/frameworks/native/ability/native/share_extension_ability/share_extension.cpp @@ -16,7 +16,6 @@ #include "share_extension.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_share_extension.h" #include "runtime.h" #include "ui_extension_context.h" diff --git a/frameworks/native/ability/native/share_extension_ability/share_extension_module_loader.cpp b/frameworks/native/ability/native/share_extension_ability/share_extension_module_loader.cpp index e07a607a59..55271243a0 100644 --- a/frameworks/native/ability/native/share_extension_ability/share_extension_module_loader.cpp +++ b/frameworks/native/ability/native/share_extension_ability/share_extension_module_loader.cpp @@ -16,7 +16,6 @@ #include "share_extension_module_loader.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "share_extension.h" namespace OHOS { diff --git a/frameworks/native/ability/native/ui_ability_impl.cpp b/frameworks/native/ability/native/ui_ability_impl.cpp index 508b5a34c6..d67057c246 100644 --- a/frameworks/native/ability/native/ui_ability_impl.cpp +++ b/frameworks/native/ability/native/ui_ability_impl.cpp @@ -20,7 +20,6 @@ #include "context/application_context.h" #include "freeze_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "js_ui_ability.h" #include "ohos_application.h" diff --git a/frameworks/native/ability/native/ui_ability_thread.cpp b/frameworks/native/ability/native/ui_ability_thread.cpp index 70122ca3a1..51fd261d3b 100644 --- a/frameworks/native/ability/native/ui_ability_thread.cpp +++ b/frameworks/native/ability/native/ui_ability_thread.cpp @@ -24,7 +24,6 @@ #include "context_deal.h" #include "freeze_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "time_util.h" diff --git a/frameworks/native/ability/native/ui_extension_ability/js_embeddable_ui_ability_context.cpp b/frameworks/native/ability/native/ui_extension_ability/js_embeddable_ui_ability_context.cpp index cff2dcca72..5a330d5589 100644 --- a/frameworks/native/ability/native/ui_extension_ability/js_embeddable_ui_ability_context.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_embeddable_ui_ability_context.cpp @@ -22,7 +22,6 @@ #include "ability_manager_client.h" #include "event_handler.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_context_utils.h" #include "js_data_struct_converter.h" #include "js_error_utils.h" diff --git a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_base.cpp b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_base.cpp index 7b1a1c819d..c6b01b615e 100644 --- a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_base.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_base.cpp @@ -22,7 +22,6 @@ #include "ability_manager_client.h" #include "configuration_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "insight_intent_executor_info.h" #include "insight_intent_executor_mgr.h" diff --git a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp index 5d112e9eae..de4a59fdf6 100644 --- a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp @@ -19,7 +19,6 @@ #include "accesstoken_kit.h" #include "event_handler.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "ipc_skeleton.h" #include "js_error_utils.h" diff --git a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage.cpp b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage.cpp index 3e81d73556..9eca40a43d 100644 --- a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage.cpp +++ b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage.cpp @@ -17,7 +17,6 @@ #include "cj_ability_stage_context.h" #include "cj_runtime.h" #include "context_impl.h" -#include "hilog_wrapper.h" #include "hilog_tag_wrapper.h" #include "securec.h" diff --git a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_context.cpp b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_context.cpp index e89338a309..8e7f3a5134 100644 --- a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_context.cpp +++ b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_context.cpp @@ -18,7 +18,6 @@ #include "hap_module_info.h" #include "ability_runtime/context/context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_object.cpp b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_object.cpp index 841dba3dc8..acd8d18d3e 100644 --- a/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_object.cpp +++ b/frameworks/native/appkit/ability_runtime/app/cj_ability_stage_object.cpp @@ -15,7 +15,6 @@ #include "cj_ability_stage_object.h" -#include "hilog_wrapper.h" #include "hilog_tag_wrapper.h" using namespace OHOS::AbilityRuntime; diff --git a/frameworks/native/appkit/ability_runtime/context/application_state_change_callback.cpp b/frameworks/native/appkit/ability_runtime/context/application_state_change_callback.cpp index a478d4ea48..e683a3a881 100755 --- a/frameworks/native/appkit/ability_runtime/context/application_state_change_callback.cpp +++ b/frameworks/native/appkit/ability_runtime/context/application_state_change_callback.cpp @@ -16,7 +16,6 @@ #include "application_state_change_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_data_struct_converter.h" #include "js_runtime_utils.h" diff --git a/frameworks/native/appkit/ability_runtime/ui_service_extension_context.cpp b/frameworks/native/appkit/ability_runtime/ui_service_extension_context.cpp index 31d36f90f1..29d3b391a3 100644 --- a/frameworks/native/appkit/ability_runtime/ui_service_extension_context.cpp +++ b/frameworks/native/appkit/ability_runtime/ui_service_extension_context.cpp @@ -22,7 +22,6 @@ #include #include "ui_content.h" #include "connection_manager.h" -#include "hilog_wrapper.h" #include "string_wrapper.h" #include "want_params_wrapper.h" diff --git a/frameworks/native/appkit/app/application_cleaner.cpp b/frameworks/native/appkit/app/application_cleaner.cpp index 502dc8af36..31b31ee211 100644 --- a/frameworks/native/appkit/app/application_cleaner.cpp +++ b/frameworks/native/appkit/app/application_cleaner.cpp @@ -25,7 +25,6 @@ #include "directory_ex.h" #include "ffrt.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "os_account_manager_wrapper.h" namespace OHOS { namespace AppExecFwk { diff --git a/frameworks/native/appkit/app/assert_fault_callback.cpp b/frameworks/native/appkit/app/assert_fault_callback.cpp index 6ab7b744bb..8abef1d6c0 100644 --- a/frameworks/native/appkit/app/assert_fault_callback.cpp +++ b/frameworks/native/appkit/app/assert_fault_callback.cpp @@ -16,7 +16,6 @@ #include "assert_fault_callback.h" #include "assert_fault_task_thread.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/app/assert_fault_task_thread.cpp b/frameworks/native/appkit/app/assert_fault_task_thread.cpp index fc5172756c..44ced3a7d6 100644 --- a/frameworks/native/appkit/app/assert_fault_task_thread.cpp +++ b/frameworks/native/appkit/app/assert_fault_task_thread.cpp @@ -21,7 +21,6 @@ #include "assert_fault_task_thread.h" #include "assert_fault_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "main_thread.h" #include "string_wrapper.h" diff --git a/frameworks/native/appkit/app/child_main_thread.cpp b/frameworks/native/appkit/app/child_main_thread.cpp index b09e06bf93..1276ea2ddf 100644 --- a/frameworks/native/appkit/app/child_main_thread.cpp +++ b/frameworks/native/appkit/app/child_main_thread.cpp @@ -19,7 +19,6 @@ #include "child_process_manager.h" #include "constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "sys_mgr_client.h" #include "system_ability_definition.h" diff --git a/frameworks/native/appkit/app/dump_runtime_helper.cpp b/frameworks/native/appkit/app/dump_runtime_helper.cpp index 75054a0d60..447a8fe428 100644 --- a/frameworks/native/appkit/app/dump_runtime_helper.cpp +++ b/frameworks/native/appkit/app/dump_runtime_helper.cpp @@ -17,7 +17,6 @@ #include "app_mgr_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "singleton.h" #include "dfx_jsnapi.h" diff --git a/frameworks/native/appkit/app/extension_plugin_info.cpp b/frameworks/native/appkit/app/extension_plugin_info.cpp index 983673ccc3..e17fec869c 100755 --- a/frameworks/native/appkit/app/extension_plugin_info.cpp +++ b/frameworks/native/appkit/app/extension_plugin_info.cpp @@ -22,7 +22,6 @@ #include "extension_module_loader.h" #include "file_path_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/app_startup/js_startup_config.cpp b/frameworks/native/appkit/app_startup/js_startup_config.cpp index 9dd117a28b..3968109d86 100644 --- a/frameworks/native/appkit/app_startup/js_startup_config.cpp +++ b/frameworks/native/appkit/app_startup/js_startup_config.cpp @@ -16,7 +16,6 @@ #include "js_startup_config.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime_utils.h" namespace OHOS { diff --git a/frameworks/native/appkit/app_startup/js_startup_task.cpp b/frameworks/native/appkit/app_startup/js_startup_task.cpp index 52bae67aa5..b183456987 100644 --- a/frameworks/native/appkit/app_startup/js_startup_task.cpp +++ b/frameworks/native/appkit/app_startup/js_startup_task.cpp @@ -16,7 +16,6 @@ #include "js_startup_task.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime_utils.h" namespace { diff --git a/frameworks/native/appkit/app_startup/js_startup_task_executor.cpp b/frameworks/native/appkit/app_startup/js_startup_task_executor.cpp index ab50d39a1e..365ce14c78 100644 --- a/frameworks/native/appkit/app_startup/js_startup_task_executor.cpp +++ b/frameworks/native/appkit/app_startup/js_startup_task_executor.cpp @@ -16,7 +16,6 @@ #include "js_startup_task_executor.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime_utils.h" #include "js_startup_task_result.h" diff --git a/frameworks/native/appkit/app_startup/startup_manager.cpp b/frameworks/native/appkit/app_startup/startup_manager.cpp index 3cc7f822ca..6f9107116e 100644 --- a/frameworks/native/appkit/app_startup/startup_manager.cpp +++ b/frameworks/native/appkit/app_startup/startup_manager.cpp @@ -18,7 +18,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/app_startup/startup_task.cpp b/frameworks/native/appkit/app_startup/startup_task.cpp index 00203dcc5a..0ea2a9250a 100644 --- a/frameworks/native/appkit/app_startup/startup_task.cpp +++ b/frameworks/native/appkit/app_startup/startup_task.cpp @@ -15,7 +15,6 @@ #include "startup_task.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/app_startup/startup_task_dispatcher.cpp b/frameworks/native/appkit/app_startup/startup_task_dispatcher.cpp index 4d7d3e750f..e7d87dd611 100644 --- a/frameworks/native/appkit/app_startup/startup_task_dispatcher.cpp +++ b/frameworks/native/appkit/app_startup/startup_task_dispatcher.cpp @@ -17,7 +17,6 @@ #include "event_handler.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "startup_manager.h" namespace OHOS { diff --git a/frameworks/native/appkit/app_startup/startup_task_manager.cpp b/frameworks/native/appkit/app_startup/startup_task_manager.cpp index b7b3203ef7..38e5b1b5b1 100644 --- a/frameworks/native/appkit/app_startup/startup_task_manager.cpp +++ b/frameworks/native/appkit/app_startup/startup_task_manager.cpp @@ -16,7 +16,6 @@ #include "startup_task_manager.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "startup_manager.h" #include "startup_topologysort.h" diff --git a/frameworks/native/appkit/app_startup/startup_task_result.cpp b/frameworks/native/appkit/app_startup/startup_task_result.cpp index a378faf843..d5f85e5748 100644 --- a/frameworks/native/appkit/app_startup/startup_task_result.cpp +++ b/frameworks/native/appkit/app_startup/startup_task_result.cpp @@ -16,7 +16,6 @@ #include "startup_task_result.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/dfr/appfreeze_inner.cpp b/frameworks/native/appkit/dfr/appfreeze_inner.cpp index 42c79941c0..3f8f1c9639 100644 --- a/frameworks/native/appkit/dfr/appfreeze_inner.cpp +++ b/frameworks/native/appkit/dfr/appfreeze_inner.cpp @@ -24,7 +24,6 @@ #include "ffrt.h" #include "freeze_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "hisysevent.h" #include "parameter.h" diff --git a/frameworks/native/appkit/dfr/appfreeze_state.cpp b/frameworks/native/appkit/dfr/appfreeze_state.cpp index 35eb37b9c5..1164784d5c 100644 --- a/frameworks/native/appkit/dfr/appfreeze_state.cpp +++ b/frameworks/native/appkit/dfr/appfreeze_state.cpp @@ -16,7 +16,6 @@ #include "appfreeze_inner.h" #include "appfreeze_state.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/native/appkit/dfr/watchdog.cpp b/frameworks/native/appkit/dfr/watchdog.cpp index 8ba3de7554..8447c963f8 100644 --- a/frameworks/native/appkit/dfr/watchdog.cpp +++ b/frameworks/native/appkit/dfr/watchdog.cpp @@ -23,7 +23,6 @@ #include "appfreeze_inner.h" #include "hisysevent.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "xcollie/watchdog.h" namespace OHOS { diff --git a/frameworks/native/child_process/src/native_child_callback.cpp b/frameworks/native/child_process/src/native_child_callback.cpp index 1102c8b3fb..9356d455ad 100644 --- a/frameworks/native/child_process/src/native_child_callback.cpp +++ b/frameworks/native/child_process/src/native_child_callback.cpp @@ -15,7 +15,6 @@ #include "native_child_callback.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_inner_object.h" #include "child_process_manager_error_utils.h" diff --git a/frameworks/native/child_process/src/native_child_process.cpp b/frameworks/native/child_process/src/native_child_process.cpp index f87e4a8562..d976d29332 100644 --- a/frameworks/native/child_process/src/native_child_process.cpp +++ b/frameworks/native/child_process/src/native_child_process.cpp @@ -17,7 +17,6 @@ #include #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "native_child_callback.h" #include "child_process_manager.h" diff --git a/frameworks/native/insight_intent/insight_intent_context/insight_intent_context.cpp b/frameworks/native/insight_intent/insight_intent_context/insight_intent_context.cpp index 198b810f3f..6862356a2b 100644 --- a/frameworks/native/insight_intent/insight_intent_context/insight_intent_context.cpp +++ b/frameworks/native/insight_intent/insight_intent_context/insight_intent_context.cpp @@ -17,7 +17,6 @@ #include "ability_manager_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" namespace OHOS { diff --git a/frameworks/native/insight_intent/insight_intent_context/js_insight_intent_context.cpp b/frameworks/native/insight_intent/insight_intent_context/js_insight_intent_context.cpp index 73229f658f..a3361c2f2c 100644 --- a/frameworks/native/insight_intent/insight_intent_context/js_insight_intent_context.cpp +++ b/frameworks/native/insight_intent/insight_intent_context/js_insight_intent_context.cpp @@ -17,7 +17,6 @@ #include "ability_window_configuration.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "js_error_utils.h" #include "napi_common_want.h" diff --git a/frameworks/simulator/ability_simulator/include/bundle_parser/json_util.h b/frameworks/simulator/ability_simulator/include/bundle_parser/json_util.h index c0cb33258c..72b3e52b47 100644 --- a/frameworks/simulator/ability_simulator/include/bundle_parser/json_util.h +++ b/frameworks/simulator/ability_simulator/include/bundle_parser/json_util.h @@ -21,7 +21,6 @@ #include "appexecfwk_errors.h" #include "bundle_constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_serializer.h" namespace OHOS { diff --git a/frameworks/simulator/ability_simulator/src/ability_context.cpp b/frameworks/simulator/ability_simulator/src/ability_context.cpp index b3fbdba0c0..a84bf082d4 100644 --- a/frameworks/simulator/ability_simulator/src/ability_context.cpp +++ b/frameworks/simulator/ability_simulator/src/ability_context.cpp @@ -17,7 +17,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/simulator/ability_simulator/src/ability_stage_context.cpp b/frameworks/simulator/ability_simulator/src/ability_stage_context.cpp index ca90bfb1cb..ca58a3e279 100644 --- a/frameworks/simulator/ability_simulator/src/ability_stage_context.cpp +++ b/frameworks/simulator/ability_simulator/src/ability_stage_context.cpp @@ -17,7 +17,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/ability_info.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/ability_info.cpp index 0721fe1fa5..c784e4bf75 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/ability_info.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/ability_info.cpp @@ -22,7 +22,6 @@ #include "bundle_constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_util.h" #include "nlohmann/json.hpp" #include "string_ex.h" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/application_info.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/application_info.cpp index 33440e25ab..f864522494 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/application_info.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/application_info.cpp @@ -23,7 +23,6 @@ #include "bundle_constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_serializer.h" #include "json_util.h" #include "nlohmann/json.hpp" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/bundle_container.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/bundle_container.cpp index e344212bab..0d062d33b0 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/bundle_container.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/bundle_container.cpp @@ -18,7 +18,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_serializer.h" #include "module_profile.h" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/extension_ability_info.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/extension_ability_info.cpp index 0ced11ac6a..3527702504 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/extension_ability_info.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/extension_ability_info.cpp @@ -21,7 +21,6 @@ #include "bundle_constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_util.h" #include "nlohmann/json.hpp" #include "string_ex.h" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/hap_module_info.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/hap_module_info.cpp index 7ff3eb6e12..6c7665d319 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/hap_module_info.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/hap_module_info.cpp @@ -17,7 +17,6 @@ #include "bundle_constants.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_util.h" #include "nlohmann/json.hpp" #include "string_ex.h" diff --git a/frameworks/simulator/ability_simulator/src/bundle_parser/module_info.cpp b/frameworks/simulator/ability_simulator/src/bundle_parser/module_info.cpp index bad5141d60..b486236860 100644 --- a/frameworks/simulator/ability_simulator/src/bundle_parser/module_info.cpp +++ b/frameworks/simulator/ability_simulator/src/bundle_parser/module_info.cpp @@ -16,7 +16,6 @@ #include "module_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_util.h" #include "nlohmann/json.hpp" #include "string_ex.h" diff --git a/frameworks/simulator/ability_simulator/src/common_func.cpp b/frameworks/simulator/ability_simulator/src/common_func.cpp index d09643b287..85b17e6019 100644 --- a/frameworks/simulator/ability_simulator/src/common_func.cpp +++ b/frameworks/simulator/ability_simulator/src/common_func.cpp @@ -16,7 +16,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "napi/native_api.h" #include "napi/native_common.h" #include "napi/native_node_api.h" diff --git a/frameworks/simulator/ability_simulator/src/js_ability_context.cpp b/frameworks/simulator/ability_simulator/src/js_ability_context.cpp index 9d31e9031b..f51f54f591 100644 --- a/frameworks/simulator/ability_simulator/src/js_ability_context.cpp +++ b/frameworks/simulator/ability_simulator/src/js_ability_context.cpp @@ -17,7 +17,6 @@ #include "ability_business_error.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_context_utils.h" #include "js_data_converter.h" #include "js_resource_manager_utils.h" diff --git a/frameworks/simulator/ability_simulator/src/js_ability_stage_context.cpp b/frameworks/simulator/ability_simulator/src/js_ability_stage_context.cpp index 0131e03073..b5e6f60603 100644 --- a/frameworks/simulator/ability_simulator/src/js_ability_stage_context.cpp +++ b/frameworks/simulator/ability_simulator/src/js_ability_stage_context.cpp @@ -16,7 +16,6 @@ #include "js_ability_stage_context.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_context_utils.h" #include "js_data_converter.h" #include "js_runtime_utils.h" diff --git a/frameworks/simulator/ability_simulator/src/js_application_context_utils.cpp b/frameworks/simulator/ability_simulator/src/js_application_context_utils.cpp index efde447aee..dfe5d59735 100644 --- a/frameworks/simulator/ability_simulator/src/js_application_context_utils.cpp +++ b/frameworks/simulator/ability_simulator/src/js_application_context_utils.cpp @@ -17,7 +17,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_context_utils.h" #include "js_data_converter.h" #include "js_runtime_utils.h" diff --git a/frameworks/simulator/ability_simulator/src/js_console_log.cpp b/frameworks/simulator/ability_simulator/src/js_console_log.cpp index 3135be714f..9aaf2ceb8c 100644 --- a/frameworks/simulator/ability_simulator/src/js_console_log.cpp +++ b/frameworks/simulator/ability_simulator/src/js_console_log.cpp @@ -18,7 +18,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime_utils.h" namespace OHOS { diff --git a/frameworks/simulator/ability_simulator/src/js_context_utils.cpp b/frameworks/simulator/ability_simulator/src/js_context_utils.cpp index c3ba1ffaac..2a4d3583f9 100644 --- a/frameworks/simulator/ability_simulator/src/js_context_utils.cpp +++ b/frameworks/simulator/ability_simulator/src/js_context_utils.cpp @@ -17,7 +17,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_application_context_utils.h" #include "js_data_converter.h" #include "js_runtime_utils.h" diff --git a/frameworks/simulator/ability_simulator/src/js_data_converter.cpp b/frameworks/simulator/ability_simulator/src/js_data_converter.cpp index c4c70e7921..2b7455c989 100644 --- a/frameworks/simulator/ability_simulator/src/js_data_converter.cpp +++ b/frameworks/simulator/ability_simulator/src/js_data_converter.cpp @@ -17,7 +17,6 @@ #include "common_func.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" #include "js_runtime_utils.h" diff --git a/frameworks/simulator/ability_simulator/src/js_runtime_utils.cpp b/frameworks/simulator/ability_simulator/src/js_runtime_utils.cpp index 975b9fe541..2c042c7b9b 100644 --- a/frameworks/simulator/ability_simulator/src/js_runtime_utils.cpp +++ b/frameworks/simulator/ability_simulator/src/js_runtime_utils.cpp @@ -16,7 +16,6 @@ #include "js_runtime_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "js_runtime.h" namespace OHOS { diff --git a/frameworks/simulator/napi_module/ability_constant/ability_constant_module.cpp b/frameworks/simulator/napi_module/ability_constant/ability_constant_module.cpp index 805fb48b11..70132844b2 100644 --- a/frameworks/simulator/napi_module/ability_constant/ability_constant_module.cpp +++ b/frameworks/simulator/napi_module/ability_constant/ability_constant_module.cpp @@ -15,7 +15,6 @@ #include "ability_window_configuration.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "launch_param.h" #include "napi/native_api.h" #include "napi/native_common.h" diff --git a/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_proxy.cpp b/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_proxy.cpp index 6465c6f166..1ba31e5c6f 100644 --- a/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_proxy.cpp +++ b/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_proxy.cpp @@ -16,7 +16,6 @@ #include "ability_foreground_state_observer_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_stub.cpp b/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_stub.cpp index 6198c9ddad..b9d123ebe6 100644 --- a/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_stub.cpp +++ b/interfaces/inner_api/ability_manager/src/ability_foreground_state_observer_stub.cpp @@ -17,7 +17,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_proxy.cpp index ed12e4c2de..2ea9594139 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_proxy.cpp @@ -16,7 +16,6 @@ #include "ability_debug_response_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_stub.cpp index f151a28885..201d15e614 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ability_debug_response_stub.cpp @@ -17,7 +17,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_proxy.cpp index f66d521ae3..b0e097a836 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_proxy.cpp @@ -16,7 +16,6 @@ #include "ability_foreground_state_observer_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_stub.cpp index 6fd67388c5..19c9502886 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ability_foreground_state_observer_stub.cpp @@ -17,7 +17,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_debug_info.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_debug_info.cpp index 7beffe1272..327338d54c 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_debug_info.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_debug_info.cpp @@ -16,7 +16,6 @@ #include "app_debug_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_proxy.cpp index 2ab746ad26..fc271be274 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_proxy.cpp @@ -16,7 +16,6 @@ #include "app_debug_listener_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_stub.cpp index 5ebc8b7b31..ae20e2535b 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_debug_listener_stub.cpp @@ -16,7 +16,6 @@ #include "app_debug_listener_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_proxy.cpp index 5eb04bfa91..59d8eada73 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_proxy.cpp @@ -16,7 +16,6 @@ #include "app_foreground_state_observer_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_stub.cpp index 0d29506075..b35443bb79 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_foreground_state_observer_stub.cpp @@ -17,7 +17,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_jsheap_mem_info.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_jsheap_mem_info.cpp index 02b4333129..f609ea7409 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_jsheap_mem_info.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_jsheap_mem_info.cpp @@ -15,7 +15,6 @@ #include "app_jsheap_mem_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_running_status_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_running_status_proxy.cpp index 296e4f763e..125e2cd854 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_running_status_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_running_status_proxy.cpp @@ -16,7 +16,6 @@ #include "app_running_status_listener_interface.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_proxy.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_running_status_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_running_status_stub.cpp index 833812fd1b..c511b43183 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_running_status_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_running_status_stub.cpp @@ -16,7 +16,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_proxy.cpp index e14eaa5e71..bc0d2df7d9 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_proxy.cpp @@ -16,7 +16,6 @@ #include "child_scheduler_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_stub.cpp index 01e9923085..b751b4c850 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/child_scheduler_stub.cpp @@ -16,7 +16,6 @@ #include "child_scheduler_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/fault_data.cpp b/interfaces/inner_api/app_manager/src/appmgr/fault_data.cpp index f9165469d6..49411bf657 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/fault_data.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/fault_data.cpp @@ -18,7 +18,6 @@ #include "nlohmann/json.hpp" #include "string_ex.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_proxy.cpp index e97ec17658..0bfd0770ee 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_proxy.cpp @@ -15,7 +15,6 @@ #include "native_child_notify_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_stub.cpp index 63ad1fb4e2..87f5336068 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/native_child_notify_stub.cpp @@ -15,7 +15,6 @@ #include "native_child_notify_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/page_state_data.cpp b/interfaces/inner_api/app_manager/src/appmgr/page_state_data.cpp index d50836472a..b1747af9dd 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/page_state_data.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/page_state_data.cpp @@ -16,7 +16,6 @@ #include "page_state_data.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parcel_macro_base.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_process_info.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_process_info.cpp index 326238eaa9..399fb6c9c7 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/render_process_info.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/render_process_info.cpp @@ -19,7 +19,6 @@ #include "string_ex.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parcel_macro_base.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_state_data.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_state_data.cpp index 838ae0dda1..8910cd0533 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/render_state_data.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/render_state_data.cpp @@ -16,7 +16,6 @@ #include "render_state_data.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parcel_macro_base.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp index 82afb071d5..9c478fa52d 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp @@ -16,7 +16,6 @@ #include "render_state_observer_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" namespace OHOS { diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp index 134826e421..8d28fa4007 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp @@ -17,7 +17,6 @@ #include "appexecfwk_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "iremote_object.h" diff --git a/interfaces/inner_api/app_manager/src/appmgr/running_multi_info.cpp b/interfaces/inner_api/app_manager/src/appmgr/running_multi_info.cpp index 104963d4c1..5c4aa852bf 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/running_multi_info.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/running_multi_info.cpp @@ -19,7 +19,6 @@ #include "string_ex.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parcel_macro_base.h" namespace OHOS { diff --git a/interfaces/inner_api/auto_fill_manager/src/auto_fill_event_handler.cpp b/interfaces/inner_api/auto_fill_manager/src/auto_fill_event_handler.cpp index dbaafabb3b..a1b971378e 100644 --- a/interfaces/inner_api/auto_fill_manager/src/auto_fill_event_handler.cpp +++ b/interfaces/inner_api/auto_fill_manager/src/auto_fill_event_handler.cpp @@ -17,7 +17,6 @@ #include "auto_fill_manager.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/interfaces/inner_api/auto_fill_manager/src/auto_fill_extension_callback.cpp b/interfaces/inner_api/auto_fill_manager/src/auto_fill_extension_callback.cpp index c6faacec00..47ea7c33fe 100644 --- a/interfaces/inner_api/auto_fill_manager/src/auto_fill_extension_callback.cpp +++ b/interfaces/inner_api/auto_fill_manager/src/auto_fill_extension_callback.cpp @@ -18,7 +18,6 @@ #include "auto_fill_manager.h" #include "auto_fill_manager_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "int_wrapper.h" #include "string_wrapper.h" #include "view_data.h" diff --git a/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager.cpp b/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager.cpp index aad7028d12..0e698f61f6 100644 --- a/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager.cpp +++ b/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager.cpp @@ -19,7 +19,6 @@ #include "auto_fill_manager_util.h" #include "extension_ability_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parameters.h" namespace OHOS { diff --git a/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager_util.cpp b/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager_util.cpp index 916c21ee60..a2df34cdb3 100644 --- a/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager_util.cpp +++ b/interfaces/inner_api/auto_fill_manager/src/auto_fill_manager_util.cpp @@ -16,7 +16,6 @@ #include "auto_fill_manager_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/interfaces/inner_api/extension_manager/src/extension_manager_client.cpp b/interfaces/inner_api/extension_manager/src/extension_manager_client.cpp index 992a8b037f..90f385b802 100755 --- a/interfaces/inner_api/extension_manager/src/extension_manager_client.cpp +++ b/interfaces/inner_api/extension_manager/src/extension_manager_client.cpp @@ -19,7 +19,6 @@ #include "extension_ability_info.h" #include "extension_manager_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "iservice_registry.h" #include "system_ability_definition.h" diff --git a/interfaces/inner_api/extension_manager/src/extension_manager_proxy.cpp b/interfaces/inner_api/extension_manager/src/extension_manager_proxy.cpp index 8cf41b31be..880fd680b6 100755 --- a/interfaces/inner_api/extension_manager/src/extension_manager_proxy.cpp +++ b/interfaces/inner_api/extension_manager/src/extension_manager_proxy.cpp @@ -18,7 +18,6 @@ #include "ability_manager_errors.h" #include "ability_manager_ipc_interface_code.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "message_parcel.h" #include "want.h" diff --git a/interfaces/inner_api/session_handler/src/session_handler_proxy.cpp b/interfaces/inner_api/session_handler/src/session_handler_proxy.cpp index 13d958b998..9857c305ae 100644 --- a/interfaces/inner_api/session_handler/src/session_handler_proxy.cpp +++ b/interfaces/inner_api/session_handler/src/session_handler_proxy.cpp @@ -15,7 +15,6 @@ #include "session_handler_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "message_parcel.h" namespace OHOS { diff --git a/interfaces/inner_api/session_handler/src/session_handler_stub.cpp b/interfaces/inner_api/session_handler/src/session_handler_stub.cpp index 9c785b26a4..2f6a1cf3a5 100644 --- a/interfaces/inner_api/session_handler/src/session_handler_stub.cpp +++ b/interfaces/inner_api/session_handler/src/session_handler_stub.cpp @@ -15,7 +15,6 @@ #include "session_handler_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "message_parcel.h" namespace OHOS { diff --git a/interfaces/kits/native/ability/native/ability_runtime/cj_ability_context_object.h b/interfaces/kits/native/ability/native/ability_runtime/cj_ability_context_object.h index a88ab07357..a6da542726 100644 --- a/interfaces/kits/native/ability/native/ability_runtime/cj_ability_context_object.h +++ b/interfaces/kits/native/ability/native/ability_runtime/cj_ability_context_object.h @@ -18,7 +18,6 @@ #include "cj_want_ffi.h" #include "cj_ability_context_broker.h" -#include "hilog_wrapper.h" extern "C" { diff --git a/interfaces/kits/native/ability/native/distributed_ability_runtime/distributed_parcel_helper.h b/interfaces/kits/native/ability/native/distributed_ability_runtime/distributed_parcel_helper.h index e935e456ad..f50e7e31eb 100644 --- a/interfaces/kits/native/ability/native/distributed_ability_runtime/distributed_parcel_helper.h +++ b/interfaces/kits/native/ability/native/distributed_ability_runtime/distributed_parcel_helper.h @@ -19,7 +19,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/interfaces/kits/native/appkit/ability_runtime/app/cj_ability_stage_context.h b/interfaces/kits/native/appkit/ability_runtime/app/cj_ability_stage_context.h index 7ddbbe1e5a..4b115858d9 100644 --- a/interfaces/kits/native/appkit/ability_runtime/app/cj_ability_stage_context.h +++ b/interfaces/kits/native/appkit/ability_runtime/app/cj_ability_stage_context.h @@ -19,7 +19,6 @@ #include #include "cj_common_ffi.h" -#include "hilog_wrapper.h" #include "ffi_remote_data.h" #include "hap_module_info.h" diff --git a/interfaces/kits/native/appkit/app_startup/startup_topologysort.h b/interfaces/kits/native/appkit/app_startup/startup_topologysort.h index 4b6b8c02bb..eb1cf5c41e 100644 --- a/interfaces/kits/native/appkit/app_startup/startup_topologysort.h +++ b/interfaces/kits/native/appkit/app_startup/startup_topologysort.h @@ -21,7 +21,6 @@ #include #include -#include "hilog_wrapper.h" #include "startup_task.h" #include "startup_sort_result.h" #include "startup_utils.h" diff --git a/services/abilitymgr/include/app_gallery_enable_util.h b/services/abilitymgr/include/app_gallery_enable_util.h index 94200dd65f..9cc5352aef 100644 --- a/services/abilitymgr/include/app_gallery_enable_util.h +++ b/services/abilitymgr/include/app_gallery_enable_util.h @@ -18,7 +18,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parameters.h" namespace OHOS { diff --git a/services/abilitymgr/src/ability_auto_startup_client.cpp b/services/abilitymgr/src/ability_auto_startup_client.cpp index fdc5dfee0d..3464930ecb 100644 --- a/services/abilitymgr/src/ability_auto_startup_client.cpp +++ b/services/abilitymgr/src/ability_auto_startup_client.cpp @@ -16,7 +16,6 @@ #include "ability_auto_startup_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "system_ability_definition.h" diff --git a/services/abilitymgr/src/ability_auto_startup_data_manager.cpp b/services/abilitymgr/src/ability_auto_startup_data_manager.cpp index f7be710aad..efb7043c38 100644 --- a/services/abilitymgr/src/ability_auto_startup_data_manager.cpp +++ b/services/abilitymgr/src/ability_auto_startup_data_manager.cpp @@ -21,7 +21,6 @@ #include "accesstoken_kit.h" #include "errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "nlohmann/json.hpp" #include "types.h" #include "os_account_manager_wrapper.h" diff --git a/services/abilitymgr/src/ability_auto_startup_service.cpp b/services/abilitymgr/src/ability_auto_startup_service.cpp index c832a77634..3e4429f350 100644 --- a/services/abilitymgr/src/ability_auto_startup_service.cpp +++ b/services/abilitymgr/src/ability_auto_startup_service.cpp @@ -28,7 +28,6 @@ #include "ability_util.h" #include "global_constant.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "in_process_call_wrapper.h" #include "ipc_skeleton.h" #include "parameters.h" diff --git a/services/abilitymgr/src/ability_background_connection.cpp b/services/abilitymgr/src/ability_background_connection.cpp index aab906ee7b..7d7e3facb0 100644 --- a/services/abilitymgr/src/ability_background_connection.cpp +++ b/services/abilitymgr/src/ability_background_connection.cpp @@ -17,7 +17,6 @@ #include "ability_background_connection.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/ability_manager_collaborator_proxy.cpp b/services/abilitymgr/src/ability_manager_collaborator_proxy.cpp index b09bd64921..f50ffc7ec4 100644 --- a/services/abilitymgr/src/ability_manager_collaborator_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_collaborator_proxy.cpp @@ -17,7 +17,6 @@ #include "configuration.h" #include "errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/ability_manager_event_subscriber.cpp b/services/abilitymgr/src/ability_manager_event_subscriber.cpp index 8e85ea1b1b..03d6be3a3b 100644 --- a/services/abilitymgr/src/ability_manager_event_subscriber.cpp +++ b/services/abilitymgr/src/ability_manager_event_subscriber.cpp @@ -17,7 +17,6 @@ #include "common_event_support.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/services/abilitymgr/src/app_exit_reason_data_manager.cpp b/services/abilitymgr/src/app_exit_reason_data_manager.cpp index 65b613bd0f..35c17c0cfb 100644 --- a/services/abilitymgr/src/app_exit_reason_data_manager.cpp +++ b/services/abilitymgr/src/app_exit_reason_data_manager.cpp @@ -23,7 +23,6 @@ #include "accesstoken_kit.h" #include "errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "nlohmann/json.hpp" #include "os_account_manager_wrapper.h" diff --git a/services/abilitymgr/src/app_exit_reason_helper.cpp b/services/abilitymgr/src/app_exit_reason_helper.cpp index 4379d6b61e..2098f8d3bf 100644 --- a/services/abilitymgr/src/app_exit_reason_helper.cpp +++ b/services/abilitymgr/src/app_exit_reason_helper.cpp @@ -26,7 +26,6 @@ #include "bundle_constants.h" #include "bundle_mgr_interface.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_skeleton.h" #include "os_account_manager_wrapper.h" #include "scene_board_judgement.h" diff --git a/services/abilitymgr/src/app_recovery/default_recovery_config.cpp b/services/abilitymgr/src/app_recovery/default_recovery_config.cpp index 964dfb3fe0..bcab228543 100755 --- a/services/abilitymgr/src/app_recovery/default_recovery_config.cpp +++ b/services/abilitymgr/src/app_recovery/default_recovery_config.cpp @@ -21,7 +21,6 @@ #include "config_policy_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/services/abilitymgr/src/assert_fault_proxy.cpp b/services/abilitymgr/src/assert_fault_proxy.cpp index 095dbf8d40..e74a5c78ff 100644 --- a/services/abilitymgr/src/assert_fault_proxy.cpp +++ b/services/abilitymgr/src/assert_fault_proxy.cpp @@ -15,7 +15,6 @@ #include "ability_manager_client.h" #include "assert_fault_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "scene_board_judgement.h" #include "task_handler_wrap.h" diff --git a/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp b/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp index 02f889cae8..3800df1efa 100644 --- a/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp +++ b/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp @@ -21,7 +21,6 @@ #include "config_policy_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/dialog_session/dialog_session_info.cpp b/services/abilitymgr/src/dialog_session/dialog_session_info.cpp index fa46604fb7..80ca9e2ae5 100644 --- a/services/abilitymgr/src/dialog_session/dialog_session_info.cpp +++ b/services/abilitymgr/src/dialog_session/dialog_session_info.cpp @@ -18,7 +18,6 @@ #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "parcel_macro.h" #include "string_ex.h" diff --git a/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp b/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp index 32f8957fcd..4af1a0344c 100644 --- a/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp +++ b/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp @@ -22,7 +22,6 @@ #include "ability_record.h" #include "ability_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "int_wrapper.h" #include "modal_system_ui_extension.h" diff --git a/services/abilitymgr/src/disposed_observer.cpp b/services/abilitymgr/src/disposed_observer.cpp index 4294e40e0e..2445a2c354 100644 --- a/services/abilitymgr/src/disposed_observer.cpp +++ b/services/abilitymgr/src/disposed_observer.cpp @@ -18,7 +18,6 @@ #include "interceptor/disposed_rule_interceptor.h" #include "ability_record.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "modal_system_ui_extension.h" #include "want.h" namespace OHOS { diff --git a/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp b/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp index 9a7fd455b0..39d1379431 100644 --- a/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp +++ b/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp @@ -19,7 +19,6 @@ #include "iservice_registry.h" #include "iremote_broker.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" namespace OHOS { diff --git a/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp b/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp index 4e740358c3..5ca1d22fad 100644 --- a/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp +++ b/services/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp @@ -22,7 +22,6 @@ #include "iremote_object.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace EcologicalRuleMgrService { diff --git a/services/abilitymgr/src/exit_reason.cpp b/services/abilitymgr/src/exit_reason.cpp index e71f9cf7d3..aa95e03d15 100644 --- a/services/abilitymgr/src/exit_reason.cpp +++ b/services/abilitymgr/src/exit_reason.cpp @@ -16,7 +16,6 @@ #include "exit_reason.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "nlohmann/json.hpp" #include "parcel_macro_base.h" #include "string_ex.h" diff --git a/services/abilitymgr/src/extension_config.cpp b/services/abilitymgr/src/extension_config.cpp index 53225eae73..7786c1c5ca 100644 --- a/services/abilitymgr/src/extension_config.cpp +++ b/services/abilitymgr/src/extension_config.cpp @@ -22,7 +22,6 @@ #include "config_policy_utils.h" #include "element_name.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/extension_record.cpp b/services/abilitymgr/src/extension_record.cpp index d9b2e2f899..cb201bd70f 100644 --- a/services/abilitymgr/src/extension_record.cpp +++ b/services/abilitymgr/src/extension_record.cpp @@ -18,7 +18,6 @@ #include "ability_util.h" #include "errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/services/abilitymgr/src/extension_record_manager.cpp b/services/abilitymgr/src/extension_record_manager.cpp index 3e97860ef8..1c320f8775 100644 --- a/services/abilitymgr/src/extension_record_manager.cpp +++ b/services/abilitymgr/src/extension_record_manager.cpp @@ -17,7 +17,6 @@ #include "ability_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ui_extension_utils.h" #include "ui_extension_record.h" #include "ui_extension_record_factory.h" diff --git a/services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp b/services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp index ab02ba051e..b1661f376d 100644 --- a/services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp +++ b/services/abilitymgr/src/insight_intent_execute_callback_proxy.cpp @@ -16,7 +16,6 @@ #include "ability_manager_errors.h" #include "insight_intent_execute_callback_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "iremote_object.h" #include "message_parcel.h" diff --git a/services/abilitymgr/src/insight_intent_execute_callback_stub.cpp b/services/abilitymgr/src/insight_intent_execute_callback_stub.cpp index 99edaec767..02d7eebc2c 100644 --- a/services/abilitymgr/src/insight_intent_execute_callback_stub.cpp +++ b/services/abilitymgr/src/insight_intent_execute_callback_stub.cpp @@ -16,7 +16,6 @@ #include "insight_intent_execute_callback_stub.h" #include "insight_intent_host_client.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/insight_intent_execute_manager.cpp b/services/abilitymgr/src/insight_intent_execute_manager.cpp index deadc706ca..315807e02c 100644 --- a/services/abilitymgr/src/insight_intent_execute_manager.cpp +++ b/services/abilitymgr/src/insight_intent_execute_manager.cpp @@ -20,7 +20,6 @@ #include "ability_manager_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "insight_intent_execute_callback_interface.h" #include "insight_intent_utils.h" #include "permission_verification.h" diff --git a/services/abilitymgr/src/insight_intent_execute_param.cpp b/services/abilitymgr/src/insight_intent_execute_param.cpp index 72968123ad..545e6ff889 100644 --- a/services/abilitymgr/src/insight_intent_execute_param.cpp +++ b/services/abilitymgr/src/insight_intent_execute_param.cpp @@ -15,7 +15,6 @@ #include "insight_intent_execute_param.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "int_wrapper.h" #include "string_wrapper.h" diff --git a/services/abilitymgr/src/insight_intent_profile.cpp b/services/abilitymgr/src/insight_intent_profile.cpp index 9052e09a86..2388b3cc42 100644 --- a/services/abilitymgr/src/insight_intent_profile.cpp +++ b/services/abilitymgr/src/insight_intent_profile.cpp @@ -16,7 +16,6 @@ #include "insight_intent_profile.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "json_util.h" #include "nlohmann/json.hpp" diff --git a/services/abilitymgr/src/insight_intent_utils.cpp b/services/abilitymgr/src/insight_intent_utils.cpp index 08eae05b34..9193667706 100644 --- a/services/abilitymgr/src/insight_intent_utils.cpp +++ b/services/abilitymgr/src/insight_intent_utils.cpp @@ -17,7 +17,6 @@ #include "bundle_mgr_helper.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "if_system_ability_manager.h" #include "in_process_call_wrapper.h" #include "insight_intent_profile.h" diff --git a/services/abilitymgr/src/interceptor/ability_interceptor_executer.cpp b/services/abilitymgr/src/interceptor/ability_interceptor_executer.cpp index be44f64183..87fabc7d48 100644 --- a/services/abilitymgr/src/interceptor/ability_interceptor_executer.cpp +++ b/services/abilitymgr/src/interceptor/ability_interceptor_executer.cpp @@ -14,7 +14,6 @@ */ #include "interceptor/ability_interceptor_executer.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" namespace OHOS { diff --git a/services/abilitymgr/src/interceptor/ability_jump_interceptor.cpp b/services/abilitymgr/src/interceptor/ability_jump_interceptor.cpp index 309640324d..eb7e9c8a21 100644 --- a/services/abilitymgr/src/interceptor/ability_jump_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/ability_jump_interceptor.cpp @@ -19,7 +19,6 @@ #include "accesstoken_kit.h" #include "app_jump_control_rule.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "in_process_call_wrapper.h" #include "permission_constants.h" diff --git a/services/abilitymgr/src/interceptor/control_interceptor.cpp b/services/abilitymgr/src/interceptor/control_interceptor.cpp index 2641a04fdd..d08c99b9ef 100644 --- a/services/abilitymgr/src/interceptor/control_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/control_interceptor.cpp @@ -18,7 +18,6 @@ #include "ability_util.h" #include "app_running_control_rule_result.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "in_process_call_wrapper.h" #include "want_params_wrapper.h" diff --git a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp index e874f343c3..75a58d96b5 100644 --- a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp @@ -17,7 +17,6 @@ #include "ability_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "in_process_call_wrapper.h" #include "start_ability_utils.h" diff --git a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp index eb2d57e626..a781fb4a47 100644 --- a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp @@ -18,7 +18,6 @@ #include "ability_record.h" #include "ability_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "in_process_call_wrapper.h" #include "iservice_registry.h" diff --git a/services/abilitymgr/src/interceptor/ecological_rule_interceptor.cpp b/services/abilitymgr/src/interceptor/ecological_rule_interceptor.cpp index 9a480dede6..58cc2e324c 100644 --- a/services/abilitymgr/src/interceptor/ecological_rule_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/ecological_rule_interceptor.cpp @@ -19,7 +19,6 @@ #include "ability_util.h" #include "ecological_rule/ability_ecological_rule_mgr_service.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "in_process_call_wrapper.h" #include "ipc_skeleton.h" diff --git a/services/abilitymgr/src/preload_uiext_state_observer.cpp b/services/abilitymgr/src/preload_uiext_state_observer.cpp index 1c01df1f06..81dc573cf6 100644 --- a/services/abilitymgr/src/preload_uiext_state_observer.cpp +++ b/services/abilitymgr/src/preload_uiext_state_observer.cpp @@ -16,7 +16,6 @@ #include "extension_record.h" #include "preload_uiext_state_observer.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { diff --git a/services/abilitymgr/src/process_options.cpp b/services/abilitymgr/src/process_options.cpp index 47163efec5..3c1ffb4ea4 100644 --- a/services/abilitymgr/src/process_options.cpp +++ b/services/abilitymgr/src/process_options.cpp @@ -16,7 +16,6 @@ #include "process_options.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/abilitymgr/src/remote_on_listener_proxy.cpp b/services/abilitymgr/src/remote_on_listener_proxy.cpp index 682e9cb127..921c6c6f40 100644 --- a/services/abilitymgr/src/remote_on_listener_proxy.cpp +++ b/services/abilitymgr/src/remote_on_listener_proxy.cpp @@ -17,7 +17,6 @@ #include "remote_on_listener_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/services/abilitymgr/src/remote_on_listener_stub.cpp b/services/abilitymgr/src/remote_on_listener_stub.cpp index b148b7caea..1d24d9e8e8 100644 --- a/services/abilitymgr/src/remote_on_listener_stub.cpp +++ b/services/abilitymgr/src/remote_on_listener_stub.cpp @@ -17,7 +17,6 @@ #include "remote_on_listener_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/services/abilitymgr/src/restart_app_manager.cpp b/services/abilitymgr/src/restart_app_manager.cpp index 077c8416e9..63efd27285 100644 --- a/services/abilitymgr/src/restart_app_manager.cpp +++ b/services/abilitymgr/src/restart_app_manager.cpp @@ -17,7 +17,6 @@ #include "app_scheduler.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_skeleton.h" namespace OHOS { diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index 1d68fd0e48..b3e631d8d6 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -24,7 +24,6 @@ #include "errors.h" #include "exit_reason.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "iability_info_callback.h" #include "in_process_call_wrapper.h" diff --git a/services/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp b/services/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp index 45b98e40e9..a9f53d6071 100644 --- a/services/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp +++ b/services/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp @@ -16,7 +16,6 @@ #include "start_ability_sandbox_savefile.h" #include #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "ability_manager_errors.h" #include "ability_util.h" diff --git a/services/abilitymgr/src/start_ability_utils.cpp b/services/abilitymgr/src/start_ability_utils.cpp index 3b299f2c6b..7af936c303 100644 --- a/services/abilitymgr/src/start_ability_utils.cpp +++ b/services/abilitymgr/src/start_ability_utils.cpp @@ -21,7 +21,6 @@ #include "bundle_mgr_helper.h" #include "global_constant.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "hitrace_meter.h" #include "server_constant.h" #include "startup_util.h" diff --git a/services/abilitymgr/src/ui_extension_ability_connect_info.cpp b/services/abilitymgr/src/ui_extension_ability_connect_info.cpp index c1e6053c08..c3490258a8 100644 --- a/services/abilitymgr/src/ui_extension_ability_connect_info.cpp +++ b/services/abilitymgr/src/ui_extension_ability_connect_info.cpp @@ -15,7 +15,6 @@ #include "ui_extension_ability_connect_info.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AbilityRuntime { diff --git a/services/abilitymgr/src/user_callback_proxy.cpp b/services/abilitymgr/src/user_callback_proxy.cpp index 3278f99cec..49f03e03ee 100644 --- a/services/abilitymgr/src/user_callback_proxy.cpp +++ b/services/abilitymgr/src/user_callback_proxy.cpp @@ -16,7 +16,6 @@ #include "user_callback_proxy.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/services/abilitymgr/src/user_callback_stub.cpp b/services/abilitymgr/src/user_callback_stub.cpp index 9503c0fe66..b4f56f3840 100644 --- a/services/abilitymgr/src/user_callback_stub.cpp +++ b/services/abilitymgr/src/user_callback_stub.cpp @@ -16,7 +16,6 @@ #include "user_callback_stub.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "ipc_types.h" #include "message_parcel.h" diff --git a/services/abilitymgr/src/utils/extension_permissions_util.cpp b/services/abilitymgr/src/utils/extension_permissions_util.cpp index 253bac84de..cb0934ad99 100644 --- a/services/abilitymgr/src/utils/extension_permissions_util.cpp +++ b/services/abilitymgr/src/utils/extension_permissions_util.cpp @@ -16,7 +16,6 @@ #include "utils/extension_permissions_util.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "permission_verification.h" namespace OHOS { diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index 2832f479cb..d58e5a1b60 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -134,7 +134,7 @@ inline const char* GetDomainName2(AAFwkLogTag tag) inline const char* GetDomainName3(AAFwkLogTag tag) { const char* tagNames[] = { "AAFwkDelegator", "AAFwkContext", "AAFwkUIAbility", "AAFwkWant", "AAFwkMission", - "AAFwkConnection", "AAFwkAtomicService", "AAFwkAbilityMgr", "AAFwkEcologicalRule", "AAFwkDataAbility" }; + "AAFwkConnection", "AAFwkAbilityMgr", "AAFwkEcologicalRule", "AAFwkDataAbility" }; uint32_t offset = GetOffset(tag, AAFwkLogTag::DELEGATOR); if (offset >= sizeof(tagNames) / sizeof(const char*)) { return "AAFwkUN"; diff --git a/services/common/src/json_utils.cpp b/services/common/src/json_utils.cpp index de7bcc936f..78c2192a85 100644 --- a/services/common/src/json_utils.cpp +++ b/services/common/src/json_utils.cpp @@ -21,7 +21,6 @@ #include "config_policy_utils.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" namespace OHOS { namespace AAFwk { diff --git a/services/dataobsmgr/src/dataobs_mgr_inner_pref.cpp b/services/dataobsmgr/src/dataobs_mgr_inner_pref.cpp index 13a68b0643..90bb8a9d9d 100644 --- a/services/dataobsmgr/src/dataobs_mgr_inner_pref.cpp +++ b/services/dataobsmgr/src/dataobs_mgr_inner_pref.cpp @@ -17,7 +17,6 @@ #include "data_ability_observer_stub.h" #include "dataobs_mgr_errors.h" #include "hilog_tag_wrapper.h" -#include "hilog_wrapper.h" #include "common_utils.h" namespace OHOS {