From 06e639827c3d80993b8f0903872a80fa671b83f1 Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 14:57:08 +0800 Subject: [PATCH 1/6] gn modify Signed-off-by: wangxuanxuan --- bundle.json | 13 +++- common/include/input_hub.cpp | 3 +- .../include/test/whitelistunittest/BUILD.gn | 1 - common/include/white_list_util.cpp | 1 - dfx_utils/BUILD.gn | 2 +- dfx_utils/src/hidumper.cpp | 3 +- dfx_utils/src/hisysevent_util.cpp | 2 +- dfx_utils/test/dfxtest/BUILD.gn | 1 - inputdevicehandler/BUILD.gn | 1 - .../src/distributed_input_handler.cpp | 2 +- .../test/inputhandlertest/BUILD.gn | 1 - interfaces/inner_kits/BUILD.gn | 1 - interfaces/inner_kits/test/unittest/BUILD.gn | 1 - .../ipc/src/distributed_input_client.cpp | 1 - .../ipc/src/distributed_input_sink_proxy.cpp | 2 - .../ipc/src/distributed_input_sink_stub.cpp | 3 +- .../BUILD.gn | 3 +- interfaces/ipc/test/clientunittest/BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../dinputsourcecallbackunittest/BUILD.gn | 3 +- interfaces/ipc/test/ipcunittest/BUILD.gn | 3 +- .../unpreparedinputcallbackunittest/BUILD.gn | 3 +- .../unregisterdinputcallbackunittest/BUILD.gn | 3 +- services/sink/inputcollector/BUILD.gn | 1 - .../src/distributed_input_collector.cpp | 2 +- .../test/sinkcollectorunittest/BUILD.gn | 1 - services/sink/sinkmanager/BUILD.gn | 3 +- .../src/distributed_input_sink_manager.cpp | 1 - .../test/sinkmanagerunittest/BUILD.gn | 3 +- services/sink/transport/BUILD.gn | 3 +- .../src/distributed_input_sink_switch.cpp | 3 +- .../src/distributed_input_sink_transport.cpp | 1 - .../transport/test/sinktransunittest/BUILD.gn | 3 +- services/source/inputinject/BUILD.gn | 1 - .../src/distributed_input_inject.cpp | 1 - .../src/distributed_input_node_manager.cpp | 1 - .../source/inputinject/src/virtual_device.cpp | 3 +- .../test/sourceinjectunittest/BUILD.gn | 1 - services/source/sourcemanager/BUILD.gn | 3 +- .../src/distributed_input_source_manager.cpp | 1 - .../distributed_input_source_sa_cli_mgr.cpp | 3 +- .../test/sourcemanagerunittest/BUILD.gn | 3 +- services/source/transport/BUILD.gn | 3 +- .../distributed_input_source_transport.cpp | 1 - .../test/sourcetransunittest/BUILD.gn | 3 +- services/transportbase/BUILD.gn | 3 +- .../src/distributed_input_transport_base.cpp | 1 - .../test/transbaseunittest/BUILD.gn | 3 +- sinkhandler/BUILD.gn | 2 +- sinkhandler/test/unittest/BUILD.gn | 2 +- sourcehandler/BUILD.gn | 2 +- sourcehandler/test/unittest/BUILD.gn | 2 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- utils/BUILD.gn | 3 +- utils/include/dinput_utils_tool.h | 3 + utils/src/dinput_context.cpp | 2 +- utils/src/dinput_utils_tool.cpp | 70 ++++++++++++++++++- utils/test/unittest/BUILD.gn | 2 +- 60 files changed, 119 insertions(+), 89 deletions(-) diff --git a/bundle.json b/bundle.json index 7e0d53f..81e3d2e 100755 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license":"Apache License 2.0", "publishAs":"code-segment", "segment":{ - "destPath":"foundation/distributedhardware/distributed_input/" + "destPath":"foundation/distributedhardware/distributed_input" }, "dirs":{}, "scripts":{}, @@ -36,12 +36,19 @@ "samgr", "dsoftbus", "c_utils", - "distributed_hardware_fwk" + "distributed_hardware_fwk", + "config_policy", + "hisysevent_native", + "hitrace_native", + "graphic_standard", + "window_manager" ], "third_party":[ "jsoncpp", "googletest", - "libcrypto_static" + "libcrypto_static", + "libevdev", + "openssl" ] }, "build":{ diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index 8d8f89a..202d56c 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -28,13 +28,12 @@ #include #include -#include "anonymous_string.h" #include "constants_dinput.h" #include "dinput_context.h" #include "dinput_errcode.h" #include "dinput_log.h" -#include "dh_utils_tool.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index cf58198..d7c2226 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("distributed_input_white_list_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] diff --git a/common/include/white_list_util.cpp b/common/include/white_list_util.cpp index 8b81788..f44c403 100644 --- a/common/include/white_list_util.cpp +++ b/common/include/white_list_util.cpp @@ -20,7 +20,6 @@ #include #include -#include "anonymous_string.h" #include "config_policy_utils.h" #include "dinput_errcode.h" diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index bb20e18..154432a 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("libdinput_dfx_utils") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", + "${utils_path}:libdinput_utils", "//third_party/openssl:libcrypto_static", ] diff --git a/dfx_utils/src/hidumper.cpp b/dfx_utils/src/hidumper.cpp index a9555e7..134fda1 100644 --- a/dfx_utils/src/hidumper.cpp +++ b/dfx_utils/src/hidumper.cpp @@ -15,11 +15,10 @@ #include "hidumper.h" -#include "anonymous_string.h" - #include "dinput_errcode.h" #include "dinput_log.h" #include "dinput_softbus_define.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/dfx_utils/src/hisysevent_util.cpp b/dfx_utils/src/hisysevent_util.cpp index f6cbafb..9d2f5e0 100644 --- a/dfx_utils/src/hisysevent_util.cpp +++ b/dfx_utils/src/hisysevent_util.cpp @@ -15,9 +15,9 @@ #include "hisysevent_util.h" -#include "anonymous_string.h" #include "dinput_errcode.h" #include "dinput_log.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index f35b58f..1d36702 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("distributed_input_dfx_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 16150c8..1db880a 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("libdinput_handler") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", diff --git a/inputdevicehandler/src/distributed_input_handler.cpp b/inputdevicehandler/src/distributed_input_handler.cpp index 4126246..c20dc04 100644 --- a/inputdevicehandler/src/distributed_input_handler.cpp +++ b/inputdevicehandler/src/distributed_input_handler.cpp @@ -28,13 +28,13 @@ #include #include -#include "anonymous_string.h" #include "nlohmann/json.hpp" #include "constants_dinput.h" #include "dinput_errcode.h" #include "dinput_log.h" #include "dinput_softbus_define.h" +#include "dinput_utils_tool.h" #include "softbus_bus_center.h" namespace OHOS { diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index 7fd3245..1c30d05 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -63,7 +63,6 @@ ohos_unittest("distributed_input_handler_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index aca3323..f8a5b05 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -77,7 +77,6 @@ ohos_shared_library("libdinput_sdk") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index 094fe41..f46e9b9 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -97,7 +97,6 @@ ohos_unittest("distributed_input_inner_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] diff --git a/interfaces/ipc/src/distributed_input_client.cpp b/interfaces/ipc/src/distributed_input_client.cpp index 4f7c912..f8de33a 100644 --- a/interfaces/ipc/src/distributed_input_client.cpp +++ b/interfaces/ipc/src/distributed_input_client.cpp @@ -15,7 +15,6 @@ #include "distributed_input_client.h" -#include "anonymous_string.h" #include "iservice_registry.h" #include "nlohmann/json.hpp" #include "system_ability_definition.h" diff --git a/interfaces/ipc/src/distributed_input_sink_proxy.cpp b/interfaces/ipc/src/distributed_input_sink_proxy.cpp index 4d4cce9..e8962de 100644 --- a/interfaces/ipc/src/distributed_input_sink_proxy.cpp +++ b/interfaces/ipc/src/distributed_input_sink_proxy.cpp @@ -15,8 +15,6 @@ #include "distributed_input_sink_proxy.h" -#include "anonymous_string.h" - #include "dinput_errcode.h" #include "dinput_ipc_interface_code.h" #include "dinput_log.h" diff --git a/interfaces/ipc/src/distributed_input_sink_stub.cpp b/interfaces/ipc/src/distributed_input_sink_stub.cpp index 7dfca96..306f6e4 100644 --- a/interfaces/ipc/src/distributed_input_sink_stub.cpp +++ b/interfaces/ipc/src/distributed_input_sink_stub.cpp @@ -15,12 +15,11 @@ #include "distributed_input_sink_stub.h" -#include "anonymous_string.h" - #include "constants_dinput.h" #include "dinput_errcode.h" #include "dinput_ipc_interface_code.h" #include "dinput_log.h" +#include "dinput_utils_tool.h" #include "i_sharing_dhid_listener.h" namespace OHOS { diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 67a144f..3b5675e 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -90,12 +90,11 @@ ohos_unittest("add_white_list_infos_callbackl_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 5c54f44..caa9575 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -108,8 +108,6 @@ ohos_unittest("distributed_input_client_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_sink_path}/sinkmanager:libdinput_sink", "${services_source_path}/inputinject:libdinput_inject", "${services_source_path}/sourcemanager:libdinput_source", @@ -118,6 +116,7 @@ ohos_unittest("distributed_input_client_test") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", "dsoftbus:softbus_client", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index 2c8d803..67d065f 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -66,12 +66,11 @@ ohos_unittest("del_white_list_infos_callbackl_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index 8c85b49..0e45633 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -90,12 +90,11 @@ ohos_unittest("dinput_source_callback_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 7574038..586805a 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -100,12 +100,11 @@ ohos_unittest("distributed_input_ipc_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", "dsoftbus:softbus_client", diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 5bd9899..379b003 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -66,12 +66,11 @@ ohos_unittest("unprepare_d_input_call_back_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 287f8d8..f2ebd19 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -66,12 +66,11 @@ ohos_unittest("unregister_d_input_call_back_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index cc14b4b..b35bf86 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -42,7 +42,6 @@ ohos_shared_library("libdinput_collector") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", diff --git a/services/sink/inputcollector/src/distributed_input_collector.cpp b/services/sink/inputcollector/src/distributed_input_collector.cpp index 31c72d7..0f664f4 100644 --- a/services/sink/inputcollector/src/distributed_input_collector.cpp +++ b/services/sink/inputcollector/src/distributed_input_collector.cpp @@ -27,11 +27,11 @@ #include #include -#include "anonymous_string.h" #include "nlohmann/json.hpp" #include "dinput_errcode.h" #include "dinput_log.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index ed77bd3..3325325 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index be58a5f..27889e4 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -53,8 +53,6 @@ ohos_shared_library("libdinput_sink") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_sink_path}/inputcollector:libdinput_collector", "${services_sink_path}/transport:libdinput_sink_trans", @@ -63,6 +61,7 @@ ohos_shared_library("libdinput_sink") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", "eventhandler:libeventhandler", diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index fdba085..60466c7 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -21,7 +21,6 @@ #include #include -#include "anonymous_string.h" #include "dinput_softbus_define.h" #include "distributed_hardware_fwk_kit.h" #include "if_system_ability_manager.h" diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index f031feb..54f99e5 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -86,8 +86,6 @@ ohos_unittest("distributed_input_sinkmanager_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_sink_path}/transport:libdinput_sink_trans", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", @@ -95,6 +93,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index a415258..560fab9 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -48,13 +48,12 @@ ohos_shared_library("libdinput_sink_trans") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/sink/transport/src/distributed_input_sink_switch.cpp b/services/sink/transport/src/distributed_input_sink_switch.cpp index c199230..3079ce6 100644 --- a/services/sink/transport/src/distributed_input_sink_switch.cpp +++ b/services/sink/transport/src/distributed_input_sink_switch.cpp @@ -15,11 +15,10 @@ #include "distributed_input_sink_switch.h" -#include "anonymous_string.h" - #include "constants_dinput.h" #include "dinput_errcode.h" #include "dinput_log.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 0cce5f2..4496148 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -19,7 +19,6 @@ #include "linux/input.h" -#include "anonymous_string.h" #include "distributed_hardware_fwk_kit.h" #include "securec.h" diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 7508c6c..fe54f6d 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -80,8 +80,6 @@ ohos_unittest("distributed_input_sinktrans_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_sink_path}/inputcollector:libdinput_collector", "${services_sink_path}/sinkmanager:libdinput_sink", "${utils_path}:libdinput_utils", @@ -89,6 +87,7 @@ ohos_unittest("distributed_input_sinktrans_test") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "eventhandler:libeventhandler", "graphic_standard:surface", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index b874d45..c5b0df2 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -48,7 +48,6 @@ ohos_shared_library("libdinput_inject") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", diff --git a/services/source/inputinject/src/distributed_input_inject.cpp b/services/source/inputinject/src/distributed_input_inject.cpp index bea0f0c..506ba24 100644 --- a/services/source/inputinject/src/distributed_input_inject.cpp +++ b/services/source/inputinject/src/distributed_input_inject.cpp @@ -17,7 +17,6 @@ #include -#include "anonymous_string.h" #include "dh_utils_tool.h" #include "nlohmann/json.hpp" diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index 55b9559..6c4838b 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -22,7 +22,6 @@ #include #include -#include "anonymous_string.h" #include "softbus_bus_center.h" #include "dinput_context.h" diff --git a/services/source/inputinject/src/virtual_device.cpp b/services/source/inputinject/src/virtual_device.cpp index fd1d021..d68721c 100644 --- a/services/source/inputinject/src/virtual_device.cpp +++ b/services/source/inputinject/src/virtual_device.cpp @@ -17,11 +17,10 @@ #include -#include "anonymous_string.h" - #include "constants_dinput.h" #include "dinput_log.h" #include "hidumper.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 5b20676..a07d32b 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -74,7 +74,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 48394f5..5fb1ce7 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -88,8 +88,6 @@ ohos_shared_library("libdinput_source") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_source_path}/inputinject:libdinput_inject", "${services_source_path}/transport:libdinput_source_trans", @@ -98,6 +96,7 @@ ohos_shared_library("libdinput_source") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", "dsoftbus:softbus_client", diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 2bca502..39a78ef 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -20,7 +20,6 @@ #include #include -#include "anonymous_string.h" #include "dinput_softbus_define.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" diff --git a/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp b/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp index ea2b9b6..9681385 100644 --- a/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp @@ -19,9 +19,8 @@ #include "iservice_registry.h" #include "system_ability_definition.h" -#include "anonymous_string.h" - #include "dinput_log.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index bf60260..35e10aa 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -110,8 +110,6 @@ ohos_unittest("distributed_input_sourcemanager_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_source_path}/transport:libdinput_source_trans", "//third_party/libevdev:libevdev", @@ -119,6 +117,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 8e4e56a..c371a55 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -45,14 +45,13 @@ ohos_shared_library("libdinput_source_trans") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index eed4934..841b8cb 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -19,7 +19,6 @@ #include #include -#include "anonymous_string.h" #include "distributed_hardware_fwk_kit.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 403547e..5e4e977 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -77,8 +77,6 @@ ohos_unittest("distributed_input_sourcetrans_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${services_source_path}/sourcemanager:libdinput_source", "${utils_path}:libdinput_utils", @@ -86,6 +84,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 8dbeea4..7f1db25 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -45,14 +45,13 @@ ohos_shared_library("libdinput_trans_base") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index e39b2ff..0532abb 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -18,7 +18,6 @@ #include #include -#include "anonymous_string.h" #include "distributed_hardware_fwk_kit.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index e59e1e0..e2cf78e 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -74,14 +74,13 @@ ohos_unittest("distributed_input_transbase_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index 4398b17..71fb58c 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -49,8 +49,8 @@ ohos_shared_library("libdinput_sink_handler") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", + "${utils_path}:libdinput_utils", ] external_deps = [ diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 3de7017..8f1ece9 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -72,8 +72,8 @@ ohos_unittest("distributed_input_sink_handler_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", + "${utils_path}:libdinput_utils", ] external_deps = [ diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 883c692..c46391a 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("libdinput_source_handler") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", + "${utils_path}:libdinput_utils", "${innerkits_path}:libdinput_sdk", "//third_party/libevdev:libevdev", ] diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index c37b072..6f6d20d 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -72,7 +72,7 @@ ohos_unittest("distributed_input_source_handler_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", + "${utils_path}:libdinput_utils", "${innerkits_path}:libdinput_sdk", "//third_party/libevdev:libevdev", ] diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 40f6d40..b013a73 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -54,13 +54,12 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index d9ef3ac..5d5dd70 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -57,14 +57,13 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index 025cdf9..63182e7 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -57,14 +57,13 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 7f471fe..83d0b68 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -45,12 +45,11 @@ ohos_shared_library("libdinput_utils") { ] deps = [ - "${fwk_interfaces_path}:libdhfwk_sdk", - "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", diff --git a/utils/include/dinput_utils_tool.h b/utils/include/dinput_utils_tool.h index eb5ea70..3ad90c7 100644 --- a/utils/include/dinput_utils_tool.h +++ b/utils/include/dinput_utils_tool.h @@ -47,6 +47,9 @@ bool IsUInt32(const nlohmann::json& jsonObj, const std::string& key); bool IsUInt64(const nlohmann::json& jsonObj, const std::string& key); bool IsArray(const nlohmann::json& jsonObj, const std::string& key); std::string GetNodeDesc(std::string parameters); +std::string GetAnonyString(const std::string &value); +std::string GetAnonyInt32(const int32_t value); +std::string Sha256(const std::string& string); } // namespace DistributedInput } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/src/dinput_context.cpp b/utils/src/dinput_context.cpp index 22bf0d5..3406579 100644 --- a/utils/src/dinput_context.cpp +++ b/utils/src/dinput_context.cpp @@ -15,10 +15,10 @@ #include "dinput_context.h" -#include "anonymous_string.h" #include "constants.h" #include "dinput_errcode.h" +#include "dinput_utils_tool.h" namespace OHOS { namespace DistributedHardware { diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 4121ec8..3c73239 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -21,8 +21,8 @@ #include -#include "anonymous_string.h" #include "nlohmann/json.hpp" +#include "securec.h" #ifndef COMPILE_TEST_MODE #include "softbus_bus_center.h" @@ -214,6 +214,74 @@ std::string GetNodeDesc(std::string parameters) return "{ nodeName: " + nodeName + ", physicalPath: " + physicalPath + ", classes: " + std::to_string(classes) + " }"; } + +std::string GetAnonyString(const std::string &value) +{ + constexpr size_t INT32_SHORT_ID_LENGTH = 20; + constexpr size_t INT32_PLAINTEXT_LENGTH = 4; + constexpr size_t INT32_MIN_ID_LENGTH = 3; + std::string res; + std::string tmpStr("******"); + size_t strLen = value.length(); + if (strLen < INT32_MIN_ID_LENGTH) { + return tmpStr; + } + + if (strLen <= INT32_SHORT_ID_LENGTH) { + res += value[0]; + res += tmpStr; + res += value[strLen - 1]; + } else { + res.append(value, 0, INT32_PLAINTEXT_LENGTH); + res += tmpStr; + res.append(value, strLen - INT32_PLAINTEXT_LENGTH, INT32_PLAINTEXT_LENGTH); + } + + return res; +} + +std::string GetAnonyInt32(const int32_t value) +{ + constexpr int32_t INT32_STRING_LENGTH = 40; + char tempBuffer[INT32_STRING_LENGTH] = ""; + int32_t secRet = sprintf_s(tempBuffer, INT32_STRING_LENGTH, "%d", value); + if (secRet <= 0) { + std::string nullString(""); + return nullString; + } + size_t length = strlen(tempBuffer); + for (size_t i = 1; i <= length - 1; i++) { + tempBuffer[i] = '*'; + } + if (length == 0x01) { + tempBuffer[0] = '*'; + } + + std::string tempString(tempBuffer); + return tempString; +} + +std::string Sha256(const std::string& in) +{ + unsigned char out[SHA256_DIGEST_LENGTH * 2 + 1] = {0}; + SHA256_CTX ctx; + SHA256_Init(&ctx); + SHA256_Update(&ctx, in.data(), in.size()); + SHA256_Final(&out[SHA256_DIGEST_LENGTH], &ctx); + // here we translate sha256 hash to hexadecimal. each 8-bit char will be presented by two characters([0-9a-f]) + constexpr int32_t WIDTH = 4; + constexpr unsigned char MASK = 0x0F; + const char* hexCode = "0123456789abcdef"; + constexpr int32_t DOUBLE_TIMES = 2; + for (int32_t i = 0; i < SHA256_DIGEST_LENGTH; ++i) { + unsigned char value = out[SHA256_DIGEST_LENGTH + i]; + // uint8_t is 2 digits in hexadecimal. + out[i * DOUBLE_TIMES] = hexCode[(value >> WIDTH) & MASK]; + out[i * DOUBLE_TIMES + 1] = hexCode[value & MASK]; + } + out[SHA256_DIGEST_LENGTH * DOUBLE_TIMES] = 0; + return reinterpret_cast(out); +} } // namespace DistributedInput } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index eba48ae..445c12e 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -67,7 +67,7 @@ ohos_unittest("distributed_input_utils_test") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", + "${utils_path}:libdinput_utils", "//third_party/openssl:libcrypto_static", ] -- Gitee From eaeed91b4be9682a8ead655433f5ad8c4eaf04cf Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 15:58:50 +0800 Subject: [PATCH 2/6] gn modify Signed-off-by: wangxuanxuan --- dfx_utils/test/dfxtest/BUILD.gn | 1 + services/sink/inputcollector/BUILD.gn | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index 1d36702..5e47184 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -62,6 +62,7 @@ ohos_unittest("distributed_input_dfx_test") { ] deps = [ + "${utils_path}:libdinput_utils", "//third_party/openssl:libcrypto_static", ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index b35bf86..dfbadab 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -45,7 +45,6 @@ ohos_shared_library("libdinput_collector") { "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", - "//third_party/openssl:libcrypto_static", ] external_deps = [ -- Gitee From ad4664ae87efbd94babcea2a5b8ba8cab70e97aa Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 19:34:46 +0800 Subject: [PATCH 3/6] gn modify Signed-off-by: wangxuanxuan --- interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn | 2 +- interfaces/ipc/test/clientunittest/BUILD.gn | 2 +- interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn | 2 +- interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn | 2 +- interfaces/ipc/test/ipcunittest/BUILD.gn | 2 +- interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn | 2 +- interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn | 2 +- services/sink/sinkmanager/BUILD.gn | 2 +- services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn | 2 +- services/sink/transport/BUILD.gn | 2 +- services/sink/transport/test/sinktransunittest/BUILD.gn | 2 +- services/source/sourcemanager/BUILD.gn | 2 +- .../source/sourcemanager/test/sourcemanagerunittest/BUILD.gn | 2 +- 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 +- sourcehandler/BUILD.gn | 2 +- sourcehandler/test/unittest/BUILD.gn | 2 +- test/fuzztest/distributedinputsinktransport_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 | 1 + 24 files changed, 24 insertions(+), 23 deletions(-) diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 3b5675e..45c68bc 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -94,8 +94,8 @@ ohos_unittest("add_white_list_infos_callbackl_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index caa9575..9b16674 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -116,9 +116,9 @@ ohos_unittest("distributed_input_client_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_standard:surface", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index 67d065f..8d748b0 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -70,8 +70,8 @@ ohos_unittest("del_white_list_infos_callbackl_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index 0e45633..b063b3b 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -94,8 +94,8 @@ ohos_unittest("dinput_source_callback_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 586805a..98cec89 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -104,9 +104,9 @@ ohos_unittest("distributed_input_ipc_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 379b003..d127cb9 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -70,8 +70,8 @@ ohos_unittest("unprepare_d_input_call_back_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index f2ebd19..80d7076 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -70,8 +70,8 @@ ohos_unittest("unregister_d_input_call_back_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 27889e4..2f4b1fe 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -61,9 +61,9 @@ ohos_shared_library("libdinput_sink") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_standard:surface", "hisysevent_native:libhisysevent", diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index 54f99e5..a89e847 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -93,12 +93,12 @@ ohos_unittest("distributed_input_sinkmanager_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_standard:surface", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 560fab9..7eeaa14 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -53,8 +53,8 @@ ohos_shared_library("libdinput_sink_trans") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index fe54f6d..0d52559 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -87,8 +87,8 @@ ohos_unittest("distributed_input_sinktrans_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_standard:surface", "hisysevent_native:libhisysevent", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 5fb1ce7..8b88b24 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -96,9 +96,9 @@ ohos_shared_library("libdinput_source") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 35e10aa..c58f558 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -117,11 +117,11 @@ ohos_unittest("distributed_input_sourcemanager_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index c371a55..964daa3 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -51,8 +51,8 @@ ohos_shared_library("libdinput_source_trans") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "samgr:samgr_proxy", diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 5e4e977..0559dcf 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -84,8 +84,8 @@ ohos_unittest("distributed_input_sourcetrans_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", ] diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 7f1db25..55a3781 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -51,8 +51,8 @@ ohos_shared_library("libdinput_trans_base") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index e2cf78e..f2e57d2 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -80,8 +80,8 @@ ohos_unittest("distributed_input_transbase_test") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", ] diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index c46391a..1194bac 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -50,8 +50,8 @@ ohos_shared_library("libdinput_source_handler") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", "${innerkits_path}:libdinput_sdk", + "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 6f6d20d..9defe8e 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -72,8 +72,8 @@ ohos_unittest("distributed_input_source_handler_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", "${innerkits_path}:libdinput_sdk", + "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index b013a73..997a006 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -59,8 +59,8 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index 5d5dd70..8921013 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -63,8 +63,8 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index 63182e7..e4c754f 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -63,8 +63,8 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 83d0b68..a774599 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -49,8 +49,8 @@ ohos_shared_library("libdinput_utils") { ] external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 445c12e..4077590 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -73,6 +73,7 @@ ohos_unittest("distributed_input_utils_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", -- Gitee From c5a21654cc8dd7cbc987f724282da9646ba7ccfe Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 21:25:57 +0800 Subject: [PATCH 4/6] gn modify Signed-off-by: wangxuanxuan --- common/include/test/whitelistunittest/BUILD.gn | 4 +--- interfaces/inner_kits/test/unittest/BUILD.gn | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index d7c2226..3ec5d33 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -61,9 +61,7 @@ ohos_unittest("distributed_input_white_list_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index f46e9b9..d7efc1d 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -96,9 +96,7 @@ ohos_unittest("distributed_input_inner_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", -- Gitee From 8c064025c97e8870aa57023cf5a1f0cc093d3466 Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 21:38:51 +0800 Subject: [PATCH 5/6] gn modify Signed-off-by: wangxuanxuan --- utils/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index a774599..e37b53c 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -44,9 +44,7 @@ ohos_shared_library("libdinput_utils") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "//third_party/openssl:libcrypto_static", - ] + deps = [ "//third_party/openssl:libcrypto_static" ] external_deps = [ "c_utils:utils", -- Gitee From 26ac952a33fefb932343744b0941bdc05e4189a0 Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Wed, 14 Jun 2023 20:21:19 +0800 Subject: [PATCH 6/6] gn modify Signed-off-by: wangxuanxuan --- common/include/input_hub.cpp | 2 +- dfx_utils/src/hidumper.cpp | 2 +- dfx_utils/src/hisysevent_util.cpp | 2 +- interfaces/ipc/src/distributed_input_client.cpp | 2 +- services/sink/transport/src/distributed_input_sink_switch.cpp | 2 +- .../sink/transport/src/distributed_input_sink_transport.cpp | 2 +- services/source/inputinject/src/distributed_input_inject.cpp | 2 +- services/source/inputinject/src/virtual_device.cpp | 2 +- .../sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp | 2 +- services/transportbase/src/distributed_input_transport_base.cpp | 2 +- utils/include/dinput_utils_tool.h | 2 +- utils/src/dinput_context.cpp | 2 +- utils/src/dinput_utils_tool.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index 202d56c..2f85b25 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/dfx_utils/src/hidumper.cpp b/dfx_utils/src/hidumper.cpp index 134fda1..82a9918 100644 --- a/dfx_utils/src/hidumper.cpp +++ b/dfx_utils/src/hidumper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/dfx_utils/src/hisysevent_util.cpp b/dfx_utils/src/hisysevent_util.cpp index 9d2f5e0..0604b06 100644 --- a/dfx_utils/src/hisysevent_util.cpp +++ b/dfx_utils/src/hisysevent_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/ipc/src/distributed_input_client.cpp b/interfaces/ipc/src/distributed_input_client.cpp index f8de33a..9b09a7a 100644 --- a/interfaces/ipc/src/distributed_input_client.cpp +++ b/interfaces/ipc/src/distributed_input_client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/sink/transport/src/distributed_input_sink_switch.cpp b/services/sink/transport/src/distributed_input_sink_switch.cpp index 3079ce6..b1b654c 100644 --- a/services/sink/transport/src/distributed_input_sink_switch.cpp +++ b/services/sink/transport/src/distributed_input_sink_switch.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 4496148..bbe6ffb 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/source/inputinject/src/distributed_input_inject.cpp b/services/source/inputinject/src/distributed_input_inject.cpp index 506ba24..323265d 100644 --- a/services/source/inputinject/src/distributed_input_inject.cpp +++ b/services/source/inputinject/src/distributed_input_inject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/source/inputinject/src/virtual_device.cpp b/services/source/inputinject/src/virtual_device.cpp index d68721c..232bfeb 100644 --- a/services/source/inputinject/src/virtual_device.cpp +++ b/services/source/inputinject/src/virtual_device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp b/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp index 9681385..118c19b 100644 --- a/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index 0532abb..f667a55 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/utils/include/dinput_utils_tool.h b/utils/include/dinput_utils_tool.h index 3ad90c7..dba9054 100644 --- a/utils/include/dinput_utils_tool.h +++ b/utils/include/dinput_utils_tool.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/utils/src/dinput_context.cpp b/utils/src/dinput_context.cpp index 3406579..2635d97 100644 --- a/utils/src/dinput_context.cpp +++ b/utils/src/dinput_context.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 3c73239..b388881 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -- Gitee