diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index f0ac725da67d8cb70c25d73383d27f7c9fe41557..e7544bfe34d567be4ae0c533709f336f96846773 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/white_list_test" group("whitelistunittest") { @@ -28,13 +29,9 @@ ohos_unittest("distributed_input_white_list_test") { include_dirs = [ "${innerkits_path}/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", - "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//foundation/distributedhardware/distributed_input/frameworks/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_sink_path}/transport/include", + "${frameworks_path}/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -42,10 +39,7 @@ ohos_unittest("distributed_input_white_list_test") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${utils_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//base/notification/eventhandler/interfaces/inner_api", ] sources = [ @@ -72,6 +66,13 @@ ohos_unittest("distributed_input_white_list_test") { "${utils_path}:libdinput_utils", ] + external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ipc:ipc_core", + ] + cflags_cc = [ "-DHILOG_ENABLE" ] } ## UnitTest distributed_input_manager_service_test }}} diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 8e563acd64816e41ba02b70cbbb30a7edf3a49b3..bb20e18dad927bf4bedee79e7ab33acc862ec5e2 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_dfx_utils") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -29,9 +27,6 @@ ohos_shared_library("libdinput_dfx_utils") { "${dfx_utils_path}/include", "${service_common}/include", "${utils_path}/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ @@ -55,6 +50,9 @@ ohos_shared_library("libdinput_dfx_utils") { "c_utils:utils", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index 2d4416eff9f0a496f5486ab9ce6cc862c42725de..f35b58f0fddf6c7608fcc196caf62392ec4b999b 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/dfx_utils" group("dfxtest") { @@ -29,8 +30,6 @@ ohos_unittest("distributed_input_dfx_test") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -39,15 +38,12 @@ ohos_unittest("distributed_input_dfx_test") { "${dfx_utils_path}/include", "${service_common}/include", "${utils_path}/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ - "${utils_path}/src/dinput_log.cpp", "${dfx_utils_path}/src/hidumper.cpp", "${dfx_utils_path}/src/hisysevent_util.cpp", + "${utils_path}/src/dinput_log.cpp", "distributed_input_dfx_test.cpp", ] @@ -74,6 +70,9 @@ ohos_unittest("distributed_input_dfx_test") { "c_utils:utils", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index a6e789f31e66be1270ec890d6aaafa23ffb29b6d..16150c8ff523e384607d957fa0e1415d486c05ec 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_handler") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -29,12 +27,8 @@ ohos_shared_library("libdinput_handler") { "${frameworks_path}/include", "${utils_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ @@ -51,13 +45,16 @@ ohos_shared_library("libdinput_handler") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index 466ceee619553ab16637c3184535415122b59708..7fd3245d4c3af3001f47efbd394bf02346823da0 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/input_handler" group("inputhandlertest") { @@ -28,8 +29,6 @@ ohos_unittest("distributed_input_handler_test") { include_dirs = [ "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -38,18 +37,14 @@ ohos_unittest("distributed_input_handler_test") { "${frameworks_path}/include", "${utils_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/distributedhardware/distributed_input/inputdevicehandler/include", + "${distributedinput_path}/inputdevicehandler/include", ] sources = [ "${common_path}/include/input_hub.cpp", - "//foundation/distributedhardware/distributed_input/inputdevicehandler/src/distributed_input_handler.cpp", + "${distributedinput_path}/inputdevicehandler/src/distributed_input_handler.cpp", "distributed_input_handler_test.cpp", ] @@ -70,15 +65,18 @@ ohos_unittest("distributed_input_handler_test") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } -## UnitTest distributed_input_handler_test }}} \ No newline at end of file +## UnitTest distributed_input_handler_test }}} diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 4358fe0d3e214515f5e2b24c3e2c513678547020..2296f30cc7d176355a13abb8c91cf3d84c2bdbb4 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -30,34 +30,28 @@ config("input_sdk_public_config") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//third_party/libevdev/libevdev/" ] } ohos_shared_library("libdinput_sdk") { - public_configs = [":input_sdk_public_config"] + public_configs = [ ":input_sdk_public_config" ] sources = [ - "${common_path}/include/white_list_util.cpp", "${common_path}/include/input_check_param.cpp", + "${common_path}/include/white_list_util.cpp", "${innerkits_path}/src/distributed_input_kit.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/dinput_sa_manager.cpp", "${ipc_path}/src/distributed_input_client.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/input_node_listener_proxy.cpp", "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", @@ -83,7 +77,6 @@ ohos_shared_library("libdinput_sdk") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", @@ -97,7 +90,10 @@ ohos_shared_library("libdinput_sdk") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index a0bc825936c8f14d7f5ef469940528751ef78016..49aacc02acaa0939413461ebb16189c17e6a5d6e 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/inner_kits" group("unittest") { @@ -31,11 +32,8 @@ ohos_unittest("distributed_input_inner_test") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//foundation/distributedhardware/distributed_input/services/include", - "//foundation/distributedhardware/distributed_input/services/src", - "//foundation/distributedhardware/distributed_input/frameworks/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${distributedinput_path}/services/include", + "${frameworks_path}/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -46,29 +44,29 @@ ohos_unittest("distributed_input_inner_test") { "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${frameworks_path}/include", - "//base/notification/eventhandler/interfaces/inner_api", ] sources = [ "${common_path}/include/white_list_util.cpp", "${innerkits_path}/src/distributed_input_kit.cpp", + "${innerkits_path}/test/unittest/mock/mock_distributed_input_client.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", + "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", - "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/input_node_listener_proxy.cpp", "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", + "${ipc_path}/src/register_d_input_call_back_proxy.cpp", + "${ipc_path}/src/register_d_input_call_back_stub.cpp", "${ipc_path}/src/sharing_dhid_listener_proxy.cpp", "${ipc_path}/src/sharing_dhid_listener_stub.cpp", "${ipc_path}/src/simulation_event_listener_proxy.cpp", "${ipc_path}/src/simulation_event_listener_stub.cpp", - "${ipc_path}/src/register_d_input_call_back_proxy.cpp", - "${ipc_path}/src/register_d_input_call_back_stub.cpp", "${ipc_path}/src/start_d_input_call_back_proxy.cpp", "${ipc_path}/src/start_d_input_call_back_stub.cpp", "${ipc_path}/src/start_stop_d_inputs_call_back_proxy.cpp", @@ -81,7 +79,6 @@ ohos_unittest("distributed_input_inner_test") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits/test/unittest/mock/mock_distributed_input_client.cpp", "distributed_input_inner_test.cpp", ] @@ -106,6 +103,7 @@ ohos_unittest("distributed_input_inner_test") { external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "ipc:ipc_core", ] diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 1cc25d67ff5bdc5045ce151927ec367b8fe70d94..67a144f7f3857a592a8065a07f43c07a76a5df1b 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("addwhitelistinfoscallbackunittest") { @@ -40,24 +41,18 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "add_white_list_infos_call_back_test.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/input_node_listener_proxy.cpp", "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", @@ -76,6 +71,7 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "${ipc_path}/src/start_stop_result_call_back_stub.cpp", "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", "${ipc_path}/src/stop_d_input_call_back_stub.cpp", + "add_white_list_infos_call_back_test.cpp", ] cflags = [ @@ -97,12 +93,14 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 504c75f352029aae6a5c5c319b17bc4aa5fd887f..51fec9f9841dc066675ea159995faee83f1d4b84 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("clientunittest") { @@ -40,13 +41,7 @@ ohos_unittest("distributed_input_client_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", "${services_source_path}/sourcemanager/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", @@ -54,33 +49,23 @@ ohos_unittest("distributed_input_client_test") { "${services_sink_path}/transport/include", "${services_sink_path}/inputcollector/include", "${services_sink_path}/sinkmanager/include", - "//foundation/window/window_manager/interfaces/innerkits/dm", - "//foundation/window/window_manager/utils/include/", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", "${distributedinput_path}/inputdevicehandler/include", ] sources = [ - "distributed_input_client_test.cpp", - "mock_samanager.cpp", - "${common_path}/include/white_list_util.cpp", "${common_path}/include/input_check_param.cpp", + "${common_path}/include/white_list_util.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_client.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/input_node_listener_proxy.cpp", "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", @@ -103,6 +88,8 @@ ohos_unittest("distributed_input_client_test") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", + "distributed_input_client_test.cpp", + "mock_samanager.cpp", ] cflags = [ @@ -123,19 +110,22 @@ ohos_unittest("distributed_input_client_test") { "${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", "${utils_path}:libdinput_utils", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager:libdinput_source", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager:libdinput_sink", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/window/window_manager/dm:libdm", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "graphic_standard:surface", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index ed0fb0c3483e9550e06c5363cb373fc50fe7d1e5..2c8d80337fbbaf286d43523ca976d6d99a4ba168 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("delwhitelistinfoscallbackunittest") { @@ -40,18 +41,13 @@ ohos_unittest("del_white_list_infos_callbackl_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "del_white_list_infos_call_back_test.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", + "del_white_list_infos_call_back_test.cpp", ] cflags = [ @@ -73,12 +69,14 @@ ohos_unittest("del_white_list_infos_callbackl_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index f04d38addb85e6c7d965c229710ab0974cfb0f20..8c85b496a7555891884ab7ad94cb0f9d8f0c589f 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("dinputsourcecallbackunittest") { @@ -40,42 +41,37 @@ ohos_unittest("dinput_source_callback_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "dinput_source_callback_unittest.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", + "${ipc_path}/src/input_node_listener_proxy.cpp", + "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", "${ipc_path}/src/register_d_input_call_back_proxy.cpp", "${ipc_path}/src/register_d_input_call_back_stub.cpp", + "${ipc_path}/src/simulation_event_listener_proxy.cpp", + "${ipc_path}/src/simulation_event_listener_stub.cpp", "${ipc_path}/src/start_d_input_call_back_proxy.cpp", "${ipc_path}/src/start_d_input_call_back_stub.cpp", + "${ipc_path}/src/start_stop_d_inputs_call_back_proxy.cpp", + "${ipc_path}/src/start_stop_d_inputs_call_back_stub.cpp", "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", "${ipc_path}/src/stop_d_input_call_back_stub.cpp", "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "${ipc_path}/src/start_stop_d_inputs_call_back_proxy.cpp", - "${ipc_path}/src/start_stop_d_inputs_call_back_stub.cpp", - "${ipc_path}/src/input_node_listener_proxy.cpp", - "${ipc_path}/src/input_node_listener_stub.cpp", - "${ipc_path}/src/simulation_event_listener_proxy.cpp", - "${ipc_path}/src/simulation_event_listener_stub.cpp", + "dinput_source_callback_unittest.cpp", ] cflags = [ @@ -97,12 +93,14 @@ ohos_unittest("dinput_source_callback_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 53add0cd910fb21f13a6171890f106b514acb125..0908f88652c5492960cda012c9d9060ca7ea9a3f 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("ipcunittest") { @@ -40,30 +41,24 @@ ohos_unittest("distributed_input_ipc_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "distributed_input_ipc_test.cpp", - "${common_path}/include/white_list_util.cpp", "${common_path}/include/input_check_param.cpp", + "${common_path}/include/white_list_util.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/dinput_sa_manager.cpp", "${ipc_path}/src/distributed_input_client.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/input_node_listener_proxy.cpp", "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", @@ -86,6 +81,7 @@ ohos_unittest("distributed_input_ipc_test") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", + "distributed_input_ipc_test.cpp", ] cflags = [ @@ -107,12 +103,14 @@ ohos_unittest("distributed_input_ipc_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 2ffd50a9eb8f15ce3eb34a72b51a72567dfc89a9..5bd989940a6e7fe900e1ce2c4b2f69fbc8aabf2f 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("unpreparedinputcallbackunittest") { @@ -40,18 +41,13 @@ ohos_unittest("unprepare_d_input_call_back_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "unprepare_d_input_call_back_test.cpp", "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", + "unprepare_d_input_call_back_test.cpp", ] cflags = [ @@ -73,12 +69,14 @@ ohos_unittest("unprepare_d_input_call_back_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 8298f6dffb4d6e0d7f3ff8749dd4e18f2b35e1fb..287f8d8ce2b5a91dfb4071b437d2a28180e93154 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/ipc" group("unregisterdinputcallbackunittest") { @@ -40,18 +41,13 @@ ohos_unittest("unregister_d_input_call_back_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//commonlibrary/c_utils/base/include", "//third_party/json/include", - "//utils/system/safwk/native/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "unregister_d_input_call_back_test.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", + "unregister_d_input_call_back_test.cpp", ] cflags = [ @@ -73,12 +69,14 @@ ohos_unittest("unregister_d_input_call_back_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 9af2f051e70e31802f590c12406735caa4edf07c..cc14b4b0220a323142e5a7c549f1206c1376d89d 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_collector") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -28,12 +26,8 @@ ohos_shared_library("libdinput_collector") { "${fwk_utils_path}/include", "${utils_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ @@ -50,13 +44,17 @@ ohos_shared_library("libdinput_collector") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//third_party/openssl:libcrypto_static", "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index e3623557109c252cf4ab0cee3a343cd76ab7b958..ed77bd31a8d68701a0cffe3c8f689bb03adab866 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/sink_collector" group("sinkcollectorunittest") { @@ -27,9 +28,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { module_out_path = module_out_path include_dirs = [ - "$services_sink_path/inputcollector/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_sink_path}/inputcollector/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", @@ -38,17 +37,13 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "${fwk_utils_path}/include", "${utils_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] sources = [ "${common_path}/include/input_hub.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/inputcollector/src/distributed_input_collector.cpp", + "${services_sink_path}/inputcollector/src/distributed_input_collector.cpp", "distributed_input_collector_test.cpp", ] @@ -67,18 +62,20 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - -## UnitTest distributed_input_manager_service_test }}} \ No newline at end of file +## UnitTest distributed_input_manager_service_test }}} diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index c0ff44535cb74f10f31758bf2bb85bd6551efc9d..d404e6602307bd48eb482652b5ec07802e9dce59 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -23,8 +23,6 @@ ohos_shared_library("libdinput_sink") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -38,17 +36,6 @@ ohos_shared_library("libdinput_sink") { "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/window/window_manager/interfaces/innerkits/dm", - "//foundation/window/window_manager/utils/include/", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//third_party/libevdev/libevdev/" ] sources = [ @@ -66,22 +53,24 @@ 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", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "//foundation/distributedhardware/distributed_input/services/sink/inputcollector:libdinput_collector", - "//foundation/distributedhardware/distributed_input/services/sink/transport:libdinput_sink_trans", - "${fwk_interfaces_path}:libdhfwk_sdk", - "//foundation/window/window_manager/dm:libdm", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "graphic_standard:surface", + "hisysevent_native:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index 2d745e23bdb941cb27f91867d600715e66455e04..e972941f29738ee8863bf5c3a9ecb9b2d6751855 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -33,11 +33,9 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${ipc_path}/include", "${ipc_path}/src", "${distributedinput_path}/services/transportbase/include", - "${distributedinput_path}/services/sink/transport/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_sink_path}/transport/include", + "${services_sink_path}/sinkmanager/include", + "${frameworks_path}/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -45,29 +43,13 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${services_sink_path}/inputcollector/include", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/window/window_manager/interfaces/innerkits/dm", - "//foundation/window/window_manager/utils/include/", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", "${common_path}/test/mock", - "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "${distributedinput_path}/services/sink/sinkmanager/test/sinkmanagerunittest/mock/", - "${services_source_path}/inputinject/include", - "${distributedinput_path}/inputdevicehandler/include", + "${services_sink_path}/sinkmanager/test/sinkmanagerunittest/mock/", ] sources = [ @@ -75,16 +57,15 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${common_path}/include/white_list_util.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", - "${distributedinput_path}/services/sink/sinkmanager/src/distributed_input_sink_event_handler.cpp", - "${distributedinput_path}/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", - "${distributedinput_path}/services/sink/sinkmanager/test/sinkmanagerunittest/mock/mock_process.cpp", - "${distributedinput_path}/services/sink/transport/src/distributed_input_sink_switch.cpp", - "${distributedinput_path}/services/sink/transport/src/distributed_input_sink_transport.cpp", - "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/sharing_dhid_listener_stub.cpp", "${services_sink_path}/inputcollector/src/distributed_input_collector.cpp", + "${services_sink_path}/sinkmanager/src/distributed_input_sink_event_handler.cpp", + "${services_sink_path}/sinkmanager/src/distributed_input_sink_manager.cpp", + "${services_sink_path}/sinkmanager/test/sinkmanagerunittest/mock/mock_process.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", "distributed_input_sinkmanager_test.cpp", ] @@ -100,30 +81,31 @@ ohos_unittest("distributed_input_sinkmanager_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE", ] deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${distributedinput_path}/services/sink/transport:libdinput_sink_trans", + "${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", - "${window_manager_path}/dm:libdm", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", - "hitrace_native:hitrace_meter", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "graphic_standard:surface", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 9f929f68ee2a5d44727664e743b75dd3b6845e75..a4152585ab20f22a38f37237fae3b82ff3efd1e2 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_sink_trans") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -33,12 +31,7 @@ ohos_shared_library("libdinput_sink_trans") { "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//third_party/libevdev/libevdev/", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "${distributedinput_path}/services/transportbase/include", ] sources = [ @@ -54,19 +47,21 @@ 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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/communication/dsoftbus/sdk:softbus_client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 36d3edcf6b72cb4f092a143768c2f3d71a5ad202..7508c6c1e771b062aca291ed232ac71ab72a7faa 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/sink_trans" group("sinktransunittest") { @@ -27,10 +28,8 @@ ohos_unittest("distributed_input_sinktrans_test") { module_out_path = module_out_path include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_sink_path}/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -40,40 +39,28 @@ ohos_unittest("distributed_input_sinktrans_test") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${dfx_utils_path}/include", "${utils_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "${common_path}/test/mock", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/include", + "${services_sink_path}/sinkmanager/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/window/window_manager/interfaces/innerkits/dm", - "//foundation/window/window_manager/utils/include/", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", "${services_sink_path}/inputcollector/include", "${services_source_path}/inputinject/include", - "//foundation/distributedhardware/distributed_input/inputdevicehandler/include", + "${distributedinput_path}/inputdevicehandler/include", ] sources = [ - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", - "distributed_input_sinktrans_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", + "${services_sink_path}/sinkmanager/src/distributed_input_sink_manager.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", + "distributed_input_sinktrans_test.cpp", ] cflags = [ @@ -88,27 +75,29 @@ ohos_unittest("distributed_input_sinktrans_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE" + "COMPILE_TEST_MODE", ] deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", - "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "${services_sink_path}/sinkmanager:libdinput_sink", "${services_sink_path}/inputcollector:libdinput_collector", - "//foundation/window/window_manager/dm:libdm", + "${services_sink_path}/sinkmanager:libdinput_sink", + "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "graphic_standard:surface", + "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", - "hitrace_native:hitrace_meter", "samgr:samgr_proxy", + "window_manager:libdm", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 887218037b118b54b93ced1686c1e944a8da975c..b874d458c556901c2d01a9612e8c1d5eabf1a428 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -20,8 +20,6 @@ ohos_shared_library("libdinput_inject") { "include", "${common_path}/include", "${frameworks_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -33,10 +31,6 @@ ohos_shared_library("libdinput_inject") { "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//third_party/libevdev/libevdev/" ] sources = [ @@ -56,13 +50,16 @@ ohos_shared_library("libdinput_inject") { "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 7a3a097ab252c70d704de6d0480c1a13c1422c39..5b20676fae7ffeca08480526cdcec369a8c8061b 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/source_inject" group("sourceinjectunittest") { @@ -28,13 +29,9 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { include_dirs = [ "${innerkits_path}/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/include", - "//foundation/distributedhardware/distributed_input/frameworks/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_source_path}/inputinject/include", + "${frameworks_path}/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", @@ -43,28 +40,22 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//base/notification/eventhandler/interfaces/inner_api", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "${common_path}/test/mock", ] sources = [ "${common_path}/include/input_hub.cpp", - "//foundation/distributedhardware/distributed_input/inputdevicehandler/src/distributed_input_handler.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_inject.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_node_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_device.cpp", - "distributed_input_sourceinject_test.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/inputdevicehandler/src/distributed_input_handler.cpp", + "${services_source_path}/inputinject/src/distributed_input_inject.cpp", + "${services_source_path}/inputinject/src/distributed_input_node_manager.cpp", + "${services_source_path}/inputinject/src/virtual_device.cpp", + "distributed_input_sourceinject_test.cpp", ] cflags = [ @@ -84,16 +75,19 @@ 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/openssl:libcrypto_static", "//third_party/libevdev:libevdev", - "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", + "//third_party/openssl:libcrypto_static", ] external_deps = [ "c_utils:utils", - "ipc:ipc_core", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index f87f93b35520361c5efbe117f1827cf91d17c1c7..021405170c7d9134a3d133d6d91b545987186381 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -24,8 +24,6 @@ ohos_shared_library("libdinput_source") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -37,47 +35,42 @@ ohos_shared_library("libdinput_source") { "${dfx_utils_path}/include", "${utils_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", ] sources = [ - "${common_path}/include/white_list_util.cpp", "${common_path}/include/input_check_param.cpp", + "${common_path}/include/white_list_util.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", + "${ipc_path}/src/input_node_listener_proxy.cpp", + "${ipc_path}/src/input_node_listener_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", "${ipc_path}/src/register_d_input_call_back_proxy.cpp", "${ipc_path}/src/register_d_input_call_back_stub.cpp", + "${ipc_path}/src/sharing_dhid_listener_proxy.cpp", + "${ipc_path}/src/sharing_dhid_listener_stub.cpp", + "${ipc_path}/src/simulation_event_listener_proxy.cpp", + "${ipc_path}/src/simulation_event_listener_stub.cpp", "${ipc_path}/src/start_d_input_call_back_proxy.cpp", "${ipc_path}/src/start_d_input_call_back_stub.cpp", - "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", - "${ipc_path}/src/stop_d_input_call_back_stub.cpp", "${ipc_path}/src/start_stop_d_inputs_call_back_proxy.cpp", "${ipc_path}/src/start_stop_d_inputs_call_back_stub.cpp", "${ipc_path}/src/start_stop_result_call_back_proxy.cpp", "${ipc_path}/src/start_stop_result_call_back_stub.cpp", - "${ipc_path}/src/input_node_listener_proxy.cpp", - "${ipc_path}/src/input_node_listener_stub.cpp", - "${ipc_path}/src/sharing_dhid_listener_proxy.cpp", - "${ipc_path}/src/sharing_dhid_listener_stub.cpp", - "${ipc_path}/src/simulation_event_listener_proxy.cpp", - "${ipc_path}/src/simulation_event_listener_stub.cpp", + "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", + "${ipc_path}/src/stop_d_input_call_back_stub.cpp", "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", @@ -95,19 +88,20 @@ 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", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", - "${fwk_interfaces_path}:libdhfwk_sdk", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 8ddc354b4e6efe1bb58d5ef75bb8212754a77e5c..2317b5877705b8e4d77c28c2562f30d5ab6d905f 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/source_manager" group("sourcemanagerunittest") { @@ -32,11 +33,9 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/include", - "//foundation/distributedhardware/distributed_input/frameworks/include", - "//foundation/distributedhardware/distributed_input/inputdevicehandler/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_source_path}/sourcemanager/include", + "${frameworks_path}/include", + "${distributedinput_path}/inputdevicehandler/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -44,37 +43,35 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${dfx_utils_path}/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "${common_path}/test/mock", - "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", + "${distributedinput_path}/services/transportbase/include", "${distributedinput_path}/utils/include", ] sources = [ "${common_path}/include/input_hub.cpp", + "${common_path}/test/mock/session_mock.cpp", + "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", + "${distributedinput_path}/utils/src/dinput_context.cpp", + "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", - "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_sink_proxy.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_proxy.cpp", + "${ipc_path}/src/get_sink_screen_infos_call_back_stub.cpp", "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", "${ipc_path}/src/register_d_input_call_back_proxy.cpp", @@ -87,19 +84,14 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_inject.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_node_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_device.cpp", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_event_handler.cpp", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp", - "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", - "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", + "${services_source_path}/inputinject/src/distributed_input_inject.cpp", + "${services_source_path}/inputinject/src/distributed_input_node_manager.cpp", + "${services_source_path}/inputinject/src/virtual_device.cpp", + "${services_source_path}/sourcemanager/src/distributed_input_source_event_handler.cpp", + "${services_source_path}/sourcemanager/src/distributed_input_source_manager.cpp", + "${services_source_path}/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", "distributed_input_sourcemanager_test.cpp", - "${common_path}/test/mock/session_mock.cpp", - "${common_path}/test/mock/softbus_bus_center_mock.cpp", - "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", - "${distributedinput_path}/utils/src/dinput_context.cpp", ] cflags = [ @@ -114,25 +106,26 @@ ohos_unittest("distributed_input_sourcemanager_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE" + "COMPILE_TEST_MODE", ] deps = [ "${dfx_utils_path}:libdinput_dfx_utils", + "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "${innerkits_path}:libdinput_sdk", + "${services_source_path}/transport:libdinput_source_trans", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", - "${fwk_interfaces_path}:libdhfwk_sdk", - "${innerkits_path}:libdinput_sdk", - "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", + "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 9765c1213d6f638ed833891bc7f8852870b35aca..cedaf2485f9f01f3808399be0784e44ff0dacb5c 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_source_trans") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", @@ -30,14 +28,11 @@ ohos_shared_library("libdinput_source_trans") { "${service_common}/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "${services_source_path}/inputinject/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//third_party/libevdev/libevdev/", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", + "${distributedinput_path}/services/transportbase/include", ] sources = [ "src/distributed_input_source_transport.cpp" ] @@ -50,18 +45,19 @@ 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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 5fa6c900d61d1e47df4b55e0c1507b97d9262d8b..5dcbda9aa4cdc9ea5bcaa80296ecfc72cd9fd904 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -661,8 +661,8 @@ void DistributedInputSourceTransport::StartLatencyCount(const std::string& devic while (isLatencyThreadRunning_.load()) { if (sendNum_ >= INPUT_LATENCY_DELAY_TIMES) { uint64_t latency = (uint64_t)(deltaTimeAll_ / 2 / INPUT_LATENCY_DELAY_TIMES); - DHLOGI("LatencyCount average single-channel latency is %d us, send times is %d, recive times is %d, " + - "each RTT latency details is %s", latency, sendNum_, recvNum_, eachLatencyDetails_.c_str()); + DHLOGI("LatencyCount average single-channel latency is %d us, send times is %d, recive times is %d.", + latency, sendNum_, recvNum_); deltaTimeAll_ = 0; sendNum_ = 0; recvNum_ = 0; diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 87ee625449e66e28dea904b5b835c7806159406c..403547e6cb9374c920c4577c335c5f33abb9d89c 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/source_trans" group("sourcetransunittest") { @@ -27,10 +28,8 @@ ohos_unittest("distributed_input_sourcetrans_test") { module_out_path = module_out_path include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_source_path}/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", @@ -42,26 +41,23 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${fwk_interfaces_path}/include/ipc", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${services_source_path}/sourcemanager/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${dfx_utils_path}/include", "${utils_path}/include", "${ipc_path}/include", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//base/notification/eventhandler/interfaces/inner_api", "${common_path}/test/mock", ] sources = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", - "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", - "distributed_input_sourcetrans_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", + "distributed_input_sourcetrans_test.cpp", ] cflags = [ @@ -76,21 +72,22 @@ ohos_unittest("distributed_input_sourcetrans_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE" + "COMPILE_TEST_MODE", ] 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", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager:libdinput_source", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", ] diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 4e0f8b9e32503b5ab65ce4b7c1439ba7b5e3d3cb..8dbeea476046718668147e78b15e60f69cec0a6c 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -19,32 +19,23 @@ ohos_shared_library("libdinput_trans_base") { include_dirs = [ "include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "//third_party/json/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${service_common}/include", "${dfx_utils_path}/include", "${utils_path}/include", - "//third_party/libevdev/libevdev/", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", + "${distributedinput_path}/services/transportbase/include", "${distributedinput_path}/services/source/inputinject/include", "${distributedinput_path}/inputdevicehandler/include", ] - sources = [ - "src/distributed_input_transport_base.cpp", - ] + sources = [ "src/distributed_input_transport_base.cpp" ] defines = [ "HI_LOG_ENABLE", @@ -54,19 +45,21 @@ ohos_shared_library("libdinput_trans_base") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", - "${fwk_utils_path}:distributedhardwareutils", "${fwk_interfaces_path}:libdhfwk_sdk", + "${fwk_utils_path}:distributedhardwareutils", + "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/communication/dsoftbus/sdk:softbus_client", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index 8ede4ae1e2874e6ea6ec828c94338b232382d897..e59e1e0838264e8bc4914ea8caa17ee91984e5b0 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/trans_base" group("transbaseunittest") { @@ -27,11 +28,9 @@ ohos_unittest("distributed_input_transbase_test") { module_out_path = module_out_path include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${distributedinput_path}/services/source/transport/include", + "${distributedinput_path}/services/sink/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${fwk_interfaces_path}/include", "${fwk_common_path}/log/include", @@ -44,21 +43,18 @@ ohos_unittest("distributed_input_transbase_test") { "${utils_path}/include", "${frameworks_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${distributedinput_path}/inputdevicehandler/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - "//base/notification/eventhandler/interfaces/inner_api", "${common_path}/test/mock", ] sources = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", - "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", - "distributed_input_transbase_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", + "distributed_input_transbase_test.cpp", ] cflags = [ @@ -73,21 +69,21 @@ ohos_unittest("distributed_input_transbase_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE" + "COMPILE_TEST_MODE", ] 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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", ] diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index 2aa7849a7629de25c97ac2de6f31b1173a63946a..4398b17e8cdbf48cdd7692a345039390d198860b 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -26,8 +26,6 @@ ohos_shared_library("libdinput_sink_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -36,8 +34,6 @@ ohos_shared_library("libdinput_sink_handler") { "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", ] sources = [ @@ -55,13 +51,14 @@ ohos_shared_library("libdinput_sink_handler") { "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "${dfx_utils_path}:libdinput_dfx_utils", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "hisysevent_native: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 c4cf9a9db2693ccb2db7ca04320b221505a6b578..3de701744d94743ad070396bb5ff1860e59f7d98 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/sink_handler" group("unittest") { @@ -36,8 +37,6 @@ ohos_unittest("distributed_input_sink_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -48,13 +47,12 @@ ohos_unittest("distributed_input_sink_handler_test") { "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", "${utils_path}/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", ] sources = [ - "//foundation/distributedhardware/distributed_input/sinkhandler/src/distributed_input_sink_handler.cpp", - "//foundation/distributedhardware/distributed_input/sinkhandler/src/load_d_input_sink_callback.cpp", - "//foundation/distributedhardware/distributed_input/sinkhandler/test/unittest/mock/mock_distributed_input_client.cpp", + "${distributedinput_path}/sinkhandler/src/distributed_input_sink_handler.cpp", + "${distributedinput_path}/sinkhandler/src/load_d_input_sink_callback.cpp", + "${distributedinput_path}/sinkhandler/test/unittest/mock/mock_distributed_input_client.cpp", "distributed_input_sinkhandler_test.cpp", ] @@ -76,11 +74,12 @@ ohos_unittest("distributed_input_sink_handler_test") { "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 81189a8f65b7f3087acbffffcfd1ca005aadbd6a..883c692ca2c56d2ab3e60ad89b8cc800e6a8ce3a 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -26,8 +26,6 @@ ohos_shared_library("libdinput_source_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -37,9 +35,6 @@ ohos_shared_library("libdinput_source_handler") { "${fwk_interfaces_path}/include/ipc", "${utils_path}/include", "${services_source_path}/inputinject/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//third_party/libevdev/libevdev/" ] sources = [ @@ -57,14 +52,15 @@ ohos_shared_library("libdinput_source_handler") { "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "${dfx_utils_path}:libdinput_dfx_utils", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "hisysevent_native: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 f50fab0b656a49565105de7cafd61a80aab6c3f2..c37b072c7c82c92de2c074e3cfe9be246879c979 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/source_handler" group("unittest") { @@ -36,8 +37,6 @@ ohos_unittest("distributed_input_source_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -48,14 +47,12 @@ ohos_unittest("distributed_input_source_handler_test") { "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", "${utils_path}/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//third_party/libevdev/libevdev/", ] sources = [ - "//foundation/distributedhardware/distributed_input/sourcehandler/src/distributed_input_source_handler.cpp", - "//foundation/distributedhardware/distributed_input/sourcehandler/src/load_d_input_source_callback.cpp", - "//foundation/distributedhardware/distributed_input/sourcehandler/test/unittest/mock/mock_distributed_input_client.cpp", + "${distributedinput_path}/sourcehandler/src/distributed_input_source_handler.cpp", + "${distributedinput_path}/sourcehandler/src/load_d_input_source_callback.cpp", + "${distributedinput_path}/sourcehandler/test/unittest/mock/mock_distributed_input_client.cpp", "distributed_input_sourcehandler_test.cpp", ] @@ -77,12 +74,13 @@ ohos_unittest("distributed_input_source_handler_test") { "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index bc08f516d310bacea1ec6cc300d552766976050b..319402a7569813ce81b3d454159328e69d31e372 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -21,7 +21,8 @@ import( ohos_fuzztest("DistributedInputClientFuzzTest") { module_out_path = "distributed_input/system" - fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputclient_fuzzer" + fuzz_config_file = + "${distributedinput_path}/test/fuzztest/distributedinputclient_fuzzer" include_dirs = [ "include", @@ -33,13 +34,9 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/sourcehandler/include", "${distributedinput_path}/sinkhandler/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${service_common}/include", "${common_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "//foundation/distributedhardware/distributed_hardware_fwk/common/log/include", "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", "//foundation/distributedhardware/distributed_hardware_fwk/utils/include/log", @@ -48,9 +45,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", "${utils_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//base/notification/eventhandler/interfaces/inner_api", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", ] cflags = [ @@ -70,6 +64,9 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 156e6fde618843c67a0437f6eefee3b10ae9e7ad..d18bcc9ebe10e5dcc9ddb53d057a2962bb8791fd 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -21,7 +21,8 @@ import( ohos_fuzztest("DistributedInputKitFuzzTest") { module_out_path = "distributed_input/system" - fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputkit_fuzzer" + fuzz_config_file = + "${distributedinput_path}/test/fuzztest/distributedinputkit_fuzzer" include_dirs = [ "include", @@ -33,13 +34,9 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${distributedinput_path}/sourcehandler/include", "${distributedinput_path}/sinkhandler/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", "${service_common}/include", "${common_path}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "//foundation/distributedhardware/distributed_hardware_fwk/common/log/include", "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", "//foundation/distributedhardware/distributed_hardware_fwk/utils/include/log", @@ -48,7 +45,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", - "//base/notification/eventhandler/interfaces/inner_api", ] cflags = [ @@ -67,6 +63,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "ipc:ipc_core", ] diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 6b48102a43ee2a02e2bfef4bc02ab3f0e64a6d46..40f6d40dbc64a9afa88d708d71d3426c9f8dfd52 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -21,13 +21,11 @@ import( ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { module_out_path = "distributed_input/system" - fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputsinktransport_fuzzer" + fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsinktransport_fuzzer" include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_sink_path}/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", @@ -37,11 +35,8 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${dfx_utils_path}/include", "${utils_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", ] cflags = [ @@ -51,25 +46,26 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", "distributed_input_sink_transport_fuzzer.cpp", ] deps = [ - "${fwk_interfaces_path}:libdhfwk_sdk", "${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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/communication/dsoftbus/sdk:softbus_client", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ipc:ipc_core", + "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index a7ae367820d045252e3d018df46b5c832bd2b974..d9ef3ac3e986766d7a9b95a0d8cd12ef9fcd6dd7 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -21,15 +21,12 @@ import( ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { module_out_path = "distributed_input/system" - fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputsourcetransport_fuzzer" + fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsourcetransport_fuzzer" include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_source_path}/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", @@ -39,14 +36,10 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${dfx_utils_path}/include", "${utils_path}/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", ] cflags = [ @@ -57,25 +50,27 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { ] sources = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", "distributed_input_source_transport_fuzzer.cpp", ] 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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index 3f83a9aee0a3f80ae2c0e706340c3ad3e42ae337..025cdf98f604cdec7552e9e926f464056fbed20e 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -21,15 +21,12 @@ import( ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { module_out_path = "distributed_input/system" - fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputtransportbase_fuzzer" + fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputtransportbase_fuzzer" include_dirs = [ - "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//foundation/distributedhardware/distributed_input/services/transportbase/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", + "${services_source_path}/transport/include", + "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "//commonlibrary/c_utils/base/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", @@ -39,14 +36,10 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "//third_party/json/include", - "//third_party/libevdev/libevdev/", "${dfx_utils_path}/include", "${utils_path}/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", ] cflags = [ @@ -57,25 +50,27 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { ] sources = [ - "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_transport_base_fuzzer.cpp", ] 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", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", ] defines = [ diff --git a/utils/BUILD.gn b/utils/BUILD.gn index b72c3092125a3e30a11ef6ef2b46c87ea0590ced..7f471fe8160cada42de6286d95ff6b18c51fb270 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -29,10 +29,7 @@ ohos_shared_library("libdinput_utils") { "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${dfx_utils_path}/include", - "//commonlibrary/c_utils/base/include", "${frameworks_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", ] sources = [ @@ -48,16 +45,18 @@ ohos_shared_library("libdinput_utils") { ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${fwk_interfaces_path}:libdhfwk_sdk", + "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", ] external_deps = [ - "dsoftbus:softbus_client", - "samgr:samgr_proxy", "c_utils:utils", + "dsoftbus:softbus_client", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware" diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 0dd27e9b9226f74e31ff5281db9a97a31930b440..eba48ae6a43bdec488c816f28db58c65069946d5 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# 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 @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributed_input/distributedinput.gni") + module_out_path = "distributed_input/utils" group("unittest") { @@ -36,21 +37,18 @@ ohos_unittest("distributed_input_utils_test") { "${common_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "//commonlibrary/c_utils/base/include", "${frameworks_path}/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/json/include", "${common_path}/test/mock", "${service_common}/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", ] sources = [ - "dinput_context_test.cpp", + "${common_path}/test/mock/softbus_bus_center_mock.cpp", "${distributedinput_path}/utils/src/dinput_context.cpp", - "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", "${distributedinput_path}/utils/src/dinput_log.cpp", - "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", + "dinput_context_test.cpp", ] cflags = [ @@ -65,7 +63,7 @@ ohos_unittest("distributed_input_utils_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", - "COMPILE_TEST_MODE" + "COMPILE_TEST_MODE", ] deps = [ @@ -74,9 +72,11 @@ ohos_unittest("distributed_input_utils_test") { ] external_deps = [ - "samgr:samgr_proxy", "c_utils:utils", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ]