From 6c63e8d3202412b9e00b2a5165d6e77048140bcc Mon Sep 17 00:00:00 2001 From: liuxiaowei Date: Mon, 3 Jul 2023 20:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue:https://gitee.com/openharmony/distributedhardware_distributed_hardware_fwk/issues/I7I339 Signed-off-by: liuxiaowei --- bundle.json | 4 ++-- dfx_utils/BUILD.gn | 2 +- dfx_utils/test/dfxtest/BUILD.gn | 2 +- services/sink/sinkmanager/BUILD.gn | 2 +- services/sink/transport/BUILD.gn | 2 +- services/sink/transport/test/sinktransunittest/BUILD.gn | 4 ++-- services/source/sourcemanager/BUILD.gn | 4 ++-- .../source/sourcemanager/test/sourcemanagerunittest/BUILD.gn | 4 ++-- services/source/transport/BUILD.gn | 2 +- services/source/transport/test/sourcetransunittest/BUILD.gn | 2 +- services/transportbase/BUILD.gn | 2 +- services/transportbase/test/transbaseunittest/BUILD.gn | 2 +- sinkhandler/BUILD.gn | 2 +- sinkhandler/test/unittest/BUILD.gn | 2 +- sourcehandler/BUILD.gn | 2 +- sourcehandler/test/unittest/BUILD.gn | 2 +- test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn | 2 +- test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn | 2 +- test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn | 2 +- test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn | 2 +- utils/BUILD.gn | 2 +- utils/test/unittest/BUILD.gn | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bundle.json b/bundle.json index 4f7e8e9..3b1ef62 100755 --- a/bundle.json +++ b/bundle.json @@ -38,8 +38,8 @@ "c_utils", "distributed_hardware_fwk", "config_policy", - "hisysevent_native", - "hitrace_native", + "hisysevent", + "hitrace", "graphic_standard", "window_manager" ], diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index dcc0bee..e0f85e6 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -44,7 +44,7 @@ ohos_shared_library("libdinput_dfx_utils") { external_deps = [ "c_utils:utils", "hilog:libhilog", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index d6df3f3..feb3ce8 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -65,7 +65,7 @@ ohos_unittest("distributed_input_dfx_test") { external_deps = [ "c_utils:utils", "hilog:libhilog", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 6e097cc..c98a340 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -65,7 +65,7 @@ ohos_shared_library("libdinput_sink") { "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_standard:surface", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 7006637..240becf 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -55,7 +55,7 @@ ohos_shared_library("libdinput_sink_trans") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 40c3c60..47a72e7 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -90,8 +90,8 @@ ohos_unittest("distributed_input_sinktrans_test") { "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_standard:surface", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index bc0f6cc..08e3a55 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -100,8 +100,8 @@ ohos_shared_library("libdinput_source") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 635b269..9b3bc45 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -122,8 +122,8 @@ ohos_unittest("distributed_input_sourcemanager_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 5d1a8ea..5796bcb 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -53,7 +53,7 @@ ohos_shared_library("libdinput_source_trans") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "samgr:samgr_proxy", ] diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 349f050..b6b84bc 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -85,7 +85,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 5c20474..7c84648 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -54,7 +54,7 @@ ohos_shared_library("libdinput_trans_base") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index 6d26de9..7b09022 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -82,7 +82,7 @@ ohos_unittest("distributed_input_transbase_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index c5321de..7a7c2f5 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -54,7 +54,7 @@ ohos_shared_library("libdinput_sink_handler") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 9475793..79738d8 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -77,7 +77,7 @@ ohos_unittest("distributed_input_sink_handler_test") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 509dda7..2c927d1 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -56,7 +56,7 @@ ohos_shared_library("libdinput_source_handler") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 23e6ec3..7c43860 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -78,7 +78,7 @@ ohos_unittest("distributed_input_source_handler_test") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn index 6b984ba..9ff82d4 100644 --- a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn index 31ef432..d74f4a4 100644 --- a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index d5cea3b..dd1c5ba 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -66,7 +66,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index da8483e..34c31d1 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -66,7 +66,7 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "hitrace_native:hitrace_meter", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index f77494a..6981ac5 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("libdinput_utils") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hilog:libhilog", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index ed6dd5a..a64a223 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -74,7 +74,7 @@ ohos_unittest("distributed_input_utils_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "hilog:libhilog", - "hisysevent_native:libhisysevent", + "hisysevent:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] -- Gitee