change hilog hisysevent hitrace

Signed-off-by: dengjiewen <dengjiewen1@huawei.com> Change-Id: Ie3bd02fc983e7d942a7ec6db356dc003e98cc541
2024-11-26 17:31:26 +00:00 · 2023-06-21 08:22:27 +00:00 · 2023-06-21 08:22:27 +00:00 · 44811bf80d
commit 44811bf80d
parent 71f3d2ec45
29 changed files with 41 additions and 42 deletions
--- a/bundle.json
+++ b/bundle.json
@ -29,19 +29,18 @@
    "ram": "7271KB",
    "deps": {
      "components": [
-        "hiviewdfx_hilog_native",
+        "hilog",
        "ipc",
        "safwk",
        "samgr",
        "init",
-        "hisysevent_native",
+        "hisysevent",
        "drivers_interface_user_auth",
        "access_token",
        "os_account",
        "napi",
-        "hilog_native",
        "hdf_core",
-        "hitrace_native",
+        "hitrace",
        "c_utils"
      ],
      "third_party": [
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@ -31,7 +31,7 @@ ohos_source_set("iam_thread_pool") {

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

  public_configs = [ ":iam_thread_pool_config" ]
@ -57,7 +57,7 @@ ohos_source_set("iam_utils") {

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

  public_configs = [
@ -79,7 +79,7 @@ ohos_source_set("iam_test") {

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

  public_configs = [ ":iam_test_config" ]
--- a/frameworks/js/napi/user_auth/BUILD.gn
+++ b/frameworks/js/napi/user_auth/BUILD.gn
@ -36,7 +36,7 @@ ohos_shared_library("userauth") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "napi:ace_napi",
  ]
--- a/frameworks/native/client/BUILD.gn
+++ b/frameworks/native/client/BUILD.gn
@ -64,7 +64,7 @@ ohos_shared_library("userauth_client") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "samgr:samgr_proxy",
  ]
--- a/frameworks/native/common/BUILD.gn
+++ b/frameworks/native/common/BUILD.gn
@ -28,7 +28,7 @@ ohos_source_set("attributes") {

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

  subsystem_name = "useriam"
@ -53,9 +53,9 @@ ohos_source_set("dfx") {

  external_deps = [
    "c_utils:utils",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
+    "hisysevent:libhisysevent",
+    "hitrace:hitrace_meter",
  ]

  subsystem_name = "useriam"
--- a/frameworks/native/executors/BUILD.gn
+++ b/frameworks/native/executors/BUILD.gn
@ -64,7 +64,7 @@ ohos_shared_library("userauth_executors") {
  external_deps = [
    "c_utils:utils",
    "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbeget_proxy",
    "ipc:ipc_single",
    "samgr:samgr_proxy",
--- a/frameworks/native/ipc/BUILD.gn
+++ b/frameworks/native/ipc/BUILD.gn
@ -47,7 +47,7 @@ ohos_source_set("userauth_client_ipc") {

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

@ -82,7 +82,7 @@ ohos_source_set("userauth_service_ipc") {

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

--- a/services/base/BUILD.gn
+++ b/services/base/BUILD.gn
@ -33,7 +33,7 @@ ohos_source_set("userauth_service_base") {
  external_deps = [
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
-    "hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/context/BUILD.gn
+++ b/services/context/BUILD.gn
@ -43,8 +43,8 @@ ohos_source_set("userauth_service_context") {

  external_deps = [
    "c_utils:utils",
-    "hilog_native:libhilog",
-    "hitrace_native:hitrace_meter",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "init:libbegetutil",
  ]

--- a/services/core/BUILD.gn
+++ b/services/core/BUILD.gn
@ -62,8 +62,8 @@ ohos_source_set("userauth_service_core") {
  external_deps = [
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
-    "hilog_native:libhilog",
-    "hitrace_native:hitrace_meter",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/services/ipc/BUILD.gn
+++ b/services/ipc/BUILD.gn
@ -45,8 +45,8 @@ ohos_source_set("userauth_services_ipc") {
    "access_token:libaccesstoken_sdk",
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
-    "hilog_native:libhilog",
-    "hitrace_native:hitrace_meter",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "init:libbegetutil",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
--- a/test/fuzztest/clients/coauthclient_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/coauthclient_fuzzer/BUILD.gn
@ -58,7 +58,7 @@ ohos_fuzztest("CoAuthClientFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/clients/executorcallbackstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/executorcallbackstub_fuzzer/BUILD.gn
@ -58,7 +58,7 @@ ohos_fuzztest("ExecutorCallbackStubFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/clients/userauthcallbackstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/userauthcallbackstub_fuzzer/BUILD.gn
@ -57,7 +57,7 @@ ohos_fuzztest("UserAuthCallbackStubFuzzTest") {
  remove_configs = [ "//build/config/compiler:no_exceptions" ]

  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/clients/userauthclient_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/userauthclient_fuzzer/BUILD.gn
@ -57,7 +57,7 @@ ohos_fuzztest("UserAuthClientFuzzTest") {
  remove_configs = [ "//build/config/compiler:no_exceptions" ]

  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/clients/useridmclient_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/useridmclient_fuzzer/BUILD.gn
@ -58,7 +58,7 @@ ohos_fuzztest("UserIdmClientFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/clients/useridmclientstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/clients/useridmclientstub_fuzzer/BUILD.gn
@ -58,7 +58,7 @@ ohos_fuzztest("UserIdmClientStubFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/executors/userauthdrivermanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/executors/userauthdrivermanager_fuzzer/BUILD.gn
@ -65,7 +65,7 @@ ohos_fuzztest("UserAuthDriverManagerFuzzTest") {
  external_deps = [
    "c_utils:utils",
    "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbeget_proxy",
    "ipc:ipc_single",
    "samgr:samgr_proxy",
--- a/test/fuzztest/executors/userauthexecutor_fuzzer/BUILD.gn
+++ b/test/fuzztest/executors/userauthexecutor_fuzzer/BUILD.gn
@ -65,7 +65,7 @@ ohos_fuzztest("UserAuthExecutorFuzzTest") {
  external_deps = [
    "c_utils:utils",
    "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbeget_proxy",
    "ipc:ipc_single",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/coauthservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/coauthservice_fuzzer/BUILD.gn
@ -51,7 +51,7 @@ ohos_fuzztest("CoAuthServiceFuzzTest") {
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/coauthstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/coauthstub_fuzzer/BUILD.gn
@ -47,7 +47,7 @@ ohos_fuzztest("CoAuthStubFuzzTest") {
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/servicecore_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/servicecore_fuzzer/BUILD.gn
@ -51,7 +51,7 @@ ohos_fuzztest("ServiceCoreFuzzTest") {

  remove_configs = [ "//build/config/compiler:no_exceptions" ]

-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  external_deps = [ "hilog:libhilog" ]

  subsystem_name = "useriam"
  part_name = "user_auth_framework"
--- a/test/fuzztest/services/userauthservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/userauthservice_fuzzer/BUILD.gn
@ -47,7 +47,7 @@ ohos_fuzztest("UserAuthServiceFuzzTest") {
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/userauthstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/userauthstub_fuzzer/BUILD.gn
@ -47,7 +47,7 @@ ohos_fuzztest("UserAuthStubFuzzTest") {
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/useridmservice_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/useridmservice_fuzzer/BUILD.gn
@ -47,7 +47,7 @@ ohos_fuzztest("UserIdmServiceFuzzTest") {

  external_deps = [
    "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/fuzztest/services/useridmstub_fuzzer/BUILD.gn
+++ b/test/fuzztest/services/useridmstub_fuzzer/BUILD.gn
@ -47,7 +47,7 @@ ohos_fuzztest("UserIdmStubFuzzTest") {
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "ipc:ipc_single",
    "safwk:system_ability_fwk",
    "samgr:samgr_proxy",
--- a/test/unittest/executors/BUILD.gn
+++ b/test/unittest/executors/BUILD.gn
@ -62,7 +62,7 @@ ohos_unittest("iam_executors_test") {
    "hdf_core:libhdf_ipc_adapter",
    "hdf_core:libhdf_utils",
    "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
    "init:libbeget_proxy",
    "ipc:ipc_single",
    "samgr:samgr_proxy",
--- a/test/unittest/inner_api/BUILD.gn
+++ b/test/unittest/inner_api/BUILD.gn
@ -70,7 +70,7 @@ ohos_unittest("iam_inner_api_test") {

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

--- a/test/unittest/services/BUILD.gn
+++ b/test/unittest/services/BUILD.gn
@ -106,8 +106,8 @@ ohos_unittest("iam_services_test") {
    "access_token:libaccesstoken_sdk",
    "c_utils:utils",
    "drivers_interface_user_auth:libuser_auth_proxy_1.1",
-    "hilog_native:libhilog",
-    "hitrace_native:hitrace_meter",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
    "init:libbegetutil",
    "ipc:ipc_single",
    "os_account:os_account_innerkits",