部件整改適配修改

Signed-off-by: cy7717 <chenyu301@huawei.com>

bundle.json

@@ -34,7 +34,7 @@
               "eventhandler", 
               "bundle_framework", 
               "ability_runtime", 
-              "hiviewdfx_hilog_native", 
+              "hilog", 
               "ability_base", 
               "safwk", 
               "input", 
@@ -43,8 +43,8 @@
               "i18n",
               "window_manager",
               "os_account",
-              "hisysevent_native",
+              "hisysevent",
-              "hitrace_native",
+              "hitrace",
               "graphic_standard"
           ], 
           "third_party": [

frameworks/js/napi/inputmethodability/BUILD.gn

@@ -69,7 +69,7 @@ ohos_shared_library("inputmethodengine") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:napi_base_context",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
     "napi:ace_napi",

frameworks/js/napi/inputmethodclient/BUILD.gn

@@ -57,7 +57,7 @@ ohos_shared_library("inputmethod") {
     "ability_runtime:abilitykit_native",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 

frameworks/kits/extension/BUILD.gn

@@ -63,7 +63,7 @@ ohos_shared_library("inputmethod_extension") {
     "ability_runtime:app_context",
     "ability_runtime:runtime",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "i18n:intl_util",
     "ipc:ipc_napi_common",
     "napi:ace_napi",
@@ -90,7 +90,7 @@ ohos_shared_library("inputmethod_extension_module") {
     "ability_runtime:abilitykit_native",
     "ability_runtime:runtime",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
   ]
 
   relative_install_dir = "extensionability/"

frameworks/native/inputmethod_ability/BUILD.gn

@@ -62,7 +62,7 @@ ohos_shared_library("inputmethod_ability") {
     "ability_runtime:ability_context_native",
     "c_utils:utils",
     "graphic_standard:window_animation",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
     "napi:ace_napi",
     "samgr:samgr_proxy",

interfaces/inner_api/inputmethod_controller/BUILD.gn

@@ -69,7 +69,7 @@ ohos_shared_library("inputmethod_client") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "samgr:samgr_proxy",
@@ -107,7 +107,7 @@ ohos_static_library("inputmethod_client_static") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "samgr:samgr_proxy",

services/BUILD.gn

@@ -72,7 +72,7 @@ ohos_shared_library("inputmethod_service") {
     "common_event_service:cesfwk_core",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "init:libbegetutil",
     "input:libmmi-client",
     "ipc:ipc_single",

services/adapter/keyboard/BUILD.gn

@@ -36,7 +36,7 @@ ohos_static_library("keboard_event_static") {
   cflags_cc = [ "-fvisibility=hidden" ]
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 

services/dfx/BUILD.gn

@@ -30,10 +30,10 @@ ohos_static_library("inputmethod_dfx_static") {
 
   external_deps = [
     "c_utils:utils",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
-    "hitrace_native:libhitracechain",
+    "hitrace:libhitracechain",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
   subsystem_name = "inputmethod"

test/fuzztest/agentstub_fuzzer/BUILD.gn

@@ -40,7 +40,7 @@ ohos_fuzztest("AgentStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 }

test/fuzztest/controlchannelstub_fuzzer/BUILD.gn

@@ -40,7 +40,7 @@ ohos_fuzztest("ControlChannelStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 }

test/fuzztest/corestub_fuzzer/BUILD.gn

@@ -43,7 +43,7 @@ ohos_fuzztest("CoreStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 }

test/fuzztest/datachannelstub_fuzzer/BUILD.gn

@@ -43,7 +43,7 @@ ohos_fuzztest("DataChannelStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 }

test/fuzztest/inputclientstub_fuzzer/BUILD.gn

@@ -45,7 +45,7 @@ ohos_fuzztest("InputClientStubFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 }

test/fuzztest/inputmethodability_fuzzer/BUILD.gn

@@ -44,7 +44,7 @@ ohos_fuzztest("InputMethodAbilityFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
     "napi:ace_napi",
   ]

test/fuzztest/inputmethodcontroller_fuzzer/BUILD.gn

@@ -44,7 +44,7 @@ ohos_fuzztest("InputMethodControllerFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
   ]

test/fuzztest/perusersession_fuzzer/BUILD.gn

@@ -50,7 +50,7 @@ ohos_fuzztest("PerUserSessionFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
     "napi:ace_napi",
   ]

test/fuzztest/systemabilitystub_fuzzer/BUILD.gn

@@ -49,7 +49,7 @@ ohos_fuzztest("SystemAbilityStubFuzzTest") {
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
   ]

test/unittest/cpp_test/BUILD.gn

@@ -45,7 +45,7 @@ ohos_unittest("InputMethodControllerTest") {
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -121,7 +121,7 @@ ohos_unittest("InputMethodServiceTest") {
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -151,9 +151,9 @@ ohos_unittest("InputMethodDfxTest") {
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
-    "hisysevent_native:libhisyseventmanager",
+    "hisysevent:libhisyseventmanager",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -186,7 +186,7 @@ ohos_unittest("InputMethodPanelTest") {
     "c_utils:utils",
     "eventhandler:libeventhandler",
     "graphic_standard:window_animation",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "napi:ace_napi",
     "os_account:os_account_innerkits",
@@ -207,7 +207,7 @@ ohos_unittest("InputMethodUtilsTest") {
 
   external_deps = [
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_core",
   ]
 }
@@ -229,7 +229,7 @@ ohos_unittest("InputMethodSwitchTest") {
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 }
@@ -253,7 +253,7 @@ ohos_unittest("InputMethodPrivateMemberTest") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
     "ipc:ipc_single",
@@ -283,7 +283,7 @@ ohos_unittest("InputMethodEditorTest") {
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -307,7 +307,7 @@ ohos_unittest("NewImeSwitchTest") {
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 }

test/unittest/cpp_test/tdd_util/BUILD.gn

@@ -39,7 +39,7 @@ ohos_static_library("inputmethod_tdd_util") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "os_account:os_account_innerkits",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",