dfxName修改

Signed-off-by: yangjingbo10 <yangjingbo10@huawei.com> Change-Id: I68a134b76662541aa2cbc2b659db04f4d3b7762b
2024-11-23 06:59:59 +00:00 · 2023-07-03 18:36:50 +08:00 · 2023-07-03 18:36:50 +08:00 · 2727d161ec
commit 2727d161ec
parent 1802fdda8c
29 changed files with 57 additions and 57 deletions
--- a/bundle.json
+++ b/bundle.json
@ -40,8 +40,8 @@
        "data_share",
        "dfs_service",
        "file_api",
-        "hitrace_native",
-        "hiviewdfx_hilog_native",
+        "hilog",
+        "hitrace",
        "huks",
        "init",
        "ipc",
--- a/interfaces/innerkits/acl/native/BUILD.gn
+++ b/interfaces/innerkits/acl/native/BUILD.gn
@ -44,7 +44,7 @@ ohos_shared_library("storage_manager_acl") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
  ]

--- a/interfaces/innerkits/storage_manager/native/BUILD.gn
+++ b/interfaces/innerkits/storage_manager/native/BUILD.gn
@ -47,8 +47,8 @@ ohos_shared_library("storage_manager_sa_proxy") {

  external_deps = [
    "c_utils:utils",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "ipc:ipc_core",
  ]
  public_deps = [
--- a/interfaces/kits/js/storage_manager/BUILD.gn
+++ b/interfaces/kits/js/storage_manager/BUILD.gn
@ -48,7 +48,7 @@ ohos_shared_library("storagestatistics") {
    "access_token:libtokenid_sdk",
    "c_utils:utils",
    "file_api:filemgmt_libn",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
@ -90,7 +90,7 @@ ohos_shared_library("volumemanager") {
    "access_token:libtokenid_sdk",
    "c_utils:utils",
    "file_api:filemgmt_libn",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
--- a/services/storage_daemon/BUILD.gn
+++ b/services/storage_daemon/BUILD.gn
@ -104,7 +104,7 @@ ohos_executable("storage_daemon") {
    "ability_base:zuri",
    "c_utils:utils",
    "dfs_service:cloud_daemon_kit_inner",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
@ -167,7 +167,7 @@ ohos_executable("sdc") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -202,7 +202,7 @@ ohos_shared_library("storage_common_utils") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
  ]

  if (build_selinux) {
--- a/services/storage_daemon/client/test/BUILD.gn
+++ b/services/storage_daemon/client/test/BUILD.gn
@ -47,7 +47,7 @@ ohos_unittest("storage_daemon_clt_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "samgr:samgr_proxy",
--- a/services/storage_daemon/crypto/BUILD.gn
+++ b/services/storage_daemon/crypto/BUILD.gn
@ -58,7 +58,7 @@ ohos_static_library("libsdcrypto") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "huks:libhukssdk",
    "init:libbegetutil",
  ]
--- a/services/storage_daemon/disk/test/BUILD.gn
+++ b/services/storage_daemon/disk/test/BUILD.gn
@ -52,7 +52,7 @@ ohos_unittest("disk_manager_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
@ -97,7 +97,7 @@ ohos_unittest("disk_info_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
@ -132,7 +132,7 @@ ohos_unittest("disk_config_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
  ]
--- a/services/storage_daemon/file_sharing/test/BUILD.gn
+++ b/services/storage_daemon/file_sharing/test/BUILD.gn
@ -58,7 +58,7 @@ ohos_moduletest("SetAclTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
  ]
 }

--- a/services/storage_daemon/ipc/test/BUILD.gn
+++ b/services/storage_daemon/ipc/test/BUILD.gn
@ -74,7 +74,7 @@ ohos_unittest("storage_daemon_test") {
    "app_file_service:fileshare_native",
    "c_utils:utils",
    "dfs_service:cloud_daemon_kit_inner",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "huks:libhukssdk",
    "init:libbegetutil",
    "ipc:ipc_core",
@ -109,7 +109,7 @@ ohos_unittest("storage_daemon_proxy_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "ipc:libdbinder",
    "safwk:system_ability_fwk",
@ -152,7 +152,7 @@ ohos_unittest("storage_daemon_stub_test") {
  external_deps = [
    "access_token:libaccesstoken_sdk",
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "huks:libhukssdk",
    "init:libbegetutil",
    "ipc:ipc_core",
--- a/services/storage_daemon/netlink/test/BUILD.gn
+++ b/services/storage_daemon/netlink/test/BUILD.gn
@ -37,7 +37,7 @@ ohos_unittest("netlink_data_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
  ]
 }
@ -80,7 +80,7 @@ ohos_unittest("netlink_handler_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
@ -111,7 +111,7 @@ ohos_unittest("netlink_listener_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
  ]
 }
@ -154,7 +154,7 @@ ohos_unittest("netlink_manager_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/storage_daemon/quota/test/BUILD.gn
+++ b/services/storage_daemon/quota/test/BUILD.gn
@ -38,7 +38,7 @@ ohos_unittest("quota_manager_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
  ]
--- a/services/storage_daemon/user/test/BUILD.gn
+++ b/services/storage_daemon/user/test/BUILD.gn
@ -51,7 +51,7 @@ ohos_unittest("user_manager_test") {
  external_deps = [
    "c_utils:utils",
    "dfs_service:cloud_daemon_kit_inner",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "huks:libhukssdk",
    "init:libbegetutil",
    "ipc:ipc_core",
--- a/services/storage_daemon/utils/test/BUILD.gn
+++ b/services/storage_daemon/utils/test/BUILD.gn
@ -39,7 +39,7 @@ ohos_unittest("file_utils_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "huks:libhukssdk",
    "ipc:ipc_core",
    "ipc:libdbinder",
--- a/services/storage_daemon/volume/test/BUILD.gn
+++ b/services/storage_daemon/volume/test/BUILD.gn
@ -42,7 +42,7 @@ ohos_unittest("external_volume_info_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
  ]
@ -74,7 +74,7 @@ ohos_unittest("process_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
  ]
@ -106,7 +106,7 @@ ohos_unittest("volume_info_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
  ]
@ -143,7 +143,7 @@ ohos_unittest("volume_manager_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/storage_manager/BUILD.gn
+++ b/services/storage_manager/BUILD.gn
@ -65,8 +65,8 @@ ohos_shared_library("storage_manager") {
    "access_token:libaccesstoken_sdk",
    "c_utils:utils",
    "common_event_service:cesfwk_innerkits",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/client/test/BUILD.gn
+++ b/services/storage_manager/client/test/BUILD.gn
@ -40,7 +40,7 @@ ohos_unittest("storage_manager_clt_test") {
    "access_token:libnativetoken",
    "access_token:libtoken_setproc",
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/crypto/test/BUILD.gn
+++ b/services/storage_manager/crypto/test/BUILD.gn
@ -39,7 +39,7 @@ ohos_unittest("crypto_manager_service_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/disk/test/BUILD.gn
+++ b/services/storage_manager/disk/test/BUILD.gn
@ -45,7 +45,7 @@ ohos_unittest("disk_manager_service_test") {
    "c_utils:utils",
    "c_utils:utils",
    "common_event_service:cesfwk_innerkits",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/innerkits_impl/test/BUILD.gn
+++ b/services/storage_manager/innerkits_impl/test/BUILD.gn
@ -34,7 +34,7 @@ ohos_unittest("disk_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -61,7 +61,7 @@ ohos_unittest("volume_core_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -92,7 +92,7 @@ ohos_unittest("volume_external_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -121,7 +121,7 @@ ohos_unittest("storage_stats_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/ipc/test/BUILD.gn
+++ b/services/storage_manager/ipc/test/BUILD.gn
@ -53,8 +53,8 @@ ohos_unittest("storage_manager_proxy_test") {
    "app_file_service:fileshare_native",
    "c_utils:utils",
    "common_event_service:cesfwk_innerkits",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -104,8 +104,8 @@ ohos_unittest("storage_manager_stub_test") {
    "access_token:libtoken_setproc",
    "app_file_service:fileshare_native",
    "c_utils:utils",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "huks:libhukssdk",
    "init:libbegetutil",
    "ipc:ipc_core",
@ -154,8 +154,8 @@ ohos_unittest("storage_manager_stub_nonpermission_test") {
    "access_token:libaccesstoken_sdk",
    "app_file_service:fileshare_native",
    "c_utils:utils",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "huks:libhukssdk",
    "init:libbegetutil",
    "ipc:ipc_core",
--- a/services/storage_manager/storage/test/BUILD.gn
+++ b/services/storage_manager/storage/test/BUILD.gn
@ -47,8 +47,8 @@ ohos_unittest("storage_total_status_service_test") {
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "common_event_service:cesfwk_innerkits",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "ipc:ipc_core",
    "relational_store:native_dataability",
    "relational_store:native_rdb",
@ -89,8 +89,8 @@ ohos_unittest("volume_storage_status_service_test") {
    "access_token:libaccesstoken_sdk",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/services/storage_manager/storage_daemon_communication/test/BUILD.gn
+++ b/services/storage_manager/storage_daemon_communication/test/BUILD.gn
@ -48,7 +48,7 @@ ohos_unittest("storage_daemon_communication_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/storage_manager/user/test/BUILD.gn
+++ b/services/storage_manager/user/test/BUILD.gn
@ -40,7 +40,7 @@ ohos_unittest("multi_user_manager_service_test") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/storage_manager/volume/test/BUILD.gn
+++ b/services/storage_manager/volume/test/BUILD.gn
@ -43,7 +43,7 @@ ohos_unittest("notification_test") {
    "ability_base:want",
    "c_utils:utils",
    "common_event_service:cesfwk_innerkits",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
@ -84,7 +84,7 @@ ohos_unittest("volume_manager_service_test") {
    "ability_base:want",
    "c_utils:utils",
    "common_event_service:cesfwk_innerkits",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/storagedaemon_fuzzer/BUILD.gn
+++ b/test/fuzztest/storagedaemon_fuzzer/BUILD.gn
@ -52,7 +52,7 @@ ohos_fuzztest("StorageDaemonFuzzTest") {
    "ability_runtime:abilitykit_native",
    "c_utils:utils",
    "dfs_service:cloud_daemon_kit_inner",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/storagemanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/storagemanager_fuzzer/BUILD.gn
@ -44,7 +44,7 @@ ohos_fuzztest("StorageManagerFuzzTest") {
    "access_token:libnativetoken",
    "access_token:libtoken_setproc",
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
  ]
--- a/test/fuzztest/storagemanagerproxy_fuzzer/BUILD.gn
+++ b/test/fuzztest/storagemanagerproxy_fuzzer/BUILD.gn
@ -41,7 +41,7 @@ ohos_fuzztest("StorageManagerProxyFuzzTest") {
  external_deps = [
    "ability_runtime:abilitykit_native",
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_core",
  ]
 }
--- a/test/fuzztest/storagetotalstatusservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/storagetotalstatusservice_fuzzer/BUILD.gn
@ -39,7 +39,7 @@ ohos_fuzztest("StorageTotalStatusServiceFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
  ]
 }