diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index f0ac725da67d8cb70c25d73383d27f7c9fe41557..123c310f730bc19cdc2389f89a2039150eed27d5 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../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,14 @@ ohos_unittest("distributed_input_white_list_test") { "${utils_path}:libdinput_utils", ] + external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "config_policy:configpolicy_util", + "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..bdd93783ec278e5694513c94b43a903553363a58 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 @@ -13,14 +13,12 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../distributedinput.gni") 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..e8a6e3be994f2ea567f9b8cdf80f408e7fb7e9d9 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../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,9 +38,6 @@ 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 = [ @@ -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..64bc3b62475b5f8ec2e3e6dc897779e3e8866020 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 @@ -13,14 +13,12 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../distributedinput.gni") 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", @@ -32,9 +30,6 @@ ohos_shared_library("libdinput_handler") { "//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 = [ @@ -58,6 +53,9 @@ ohos_shared_library("libdinput_handler") { 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..938fb63d5cdfb2e35b770ccd4e2b20a95492a6da 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../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", @@ -41,15 +40,12 @@ ohos_unittest("distributed_input_handler_test") { "//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", ] @@ -77,6 +73,9 @@ ohos_unittest("distributed_input_handler_test") { 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/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 4358fe0d3e214515f5e2b24c3e2c513678547020..70975b0c60ec4563a30c93258d43a428817b30d3 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 @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../distributedinput.gni") config("input_sdk_public_config") { include_dirs = [ @@ -30,34 +30,29 @@ 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/" + "//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 +78,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,8 +91,12 @@ ohos_shared_library("libdinput_sdk") { external_deps = [ "c_utils:utils", + "config_policy:configpolicy_util", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index a0bc825936c8f14d7f5ef469940528751ef78016..a8723ed23ef9862863304669d366893ec04094bc 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../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,7 +44,6 @@ 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 = [ @@ -56,19 +53,19 @@ ohos_unittest("distributed_input_inner_test") { "${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 +78,7 @@ 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", + "${innerkits_path}/test/unittest/mock/mock_distributed_input_client.cpp", "distributed_input_inner_test.cpp", ] @@ -106,6 +103,8 @@ ohos_unittest("distributed_input_inner_test") { external_deps = [ "c_utils:utils", + "config_policy:configpolicy_util", + "eventhandler:libeventhandler", "ipc:ipc_core", ] diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 1cc25d67ff5bdc5045ce151927ec367b8fe70d94..ec7a9226b47047f3babe661fc1fa0cac3e50e83f 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") + module_out_path = "distributed_input/ipc" group("addwhitelistinfoscallbackunittest") { @@ -40,12 +41,7 @@ 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 = [ @@ -97,13 +93,15 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 504c75f352029aae6a5c5c319b17bc4aa5fd887f..1155ef090c398373048280ac89a135999ab0ec31 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") + module_out_path = "distributed_input/ipc" group("clientunittest") { @@ -40,13 +41,8 @@ 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 +50,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 +89,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 = [ @@ -124,18 +112,22 @@ ohos_unittest("distributed_input_client_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${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", + "${services_sink_path}/sinkmanager:libdinput_sink", + "${services_source_path}/inputinject:libdinput_inject", + "${services_source_path}/sourcemanager:libdinput_source", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "config_policy:configpolicy_util", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "graphic_standard:surface", "ipc:ipc_core", "samgr:samgr_proxy", + "safwk:system_ability_fwk", + "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..901beda046a73a95e1ccfe4d6ed8f197a89fd24f 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") + module_out_path = "distributed_input/ipc" group("delwhitelistinfoscallbackunittest") { @@ -40,12 +41,7 @@ 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 = [ @@ -73,13 +69,15 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index f04d38addb85e6c7d965c229710ab0974cfb0f20..cdb99a78499065d2c638df9a46143b95971670f7 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 @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") module_out_path = "distributed_input/ipc" group("dinputsourcecallbackunittest") { @@ -40,12 +40,7 @@ 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 = [ @@ -97,13 +92,15 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 53add0cd910fb21f13a6171890f106b514acb125..a039290c9d7bc96612ffd54f9fc15d2e7520bb77 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../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,13 +103,16 @@ 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", + "config_policy:configpolicy_util", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ipc:ipc_core", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 2ffd50a9eb8f15ce3eb34a72b51a72567dfc89a9..3c587c4a3091f621087ad76a5013c67d3ce9476e 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") + module_out_path = "distributed_input/ipc" group("unpreparedinputcallbackunittest") { @@ -40,12 +41,7 @@ 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 = [ @@ -73,13 +69,15 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 8298f6dffb4d6e0d7f3ff8749dd4e18f2b35e1fb..8f0978a8f4f15868d546dca250a1053037037a4e 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../distributedinput.gni") + module_out_path = "distributed_input/ipc" group("unregisterdinputcallbackunittest") { @@ -40,12 +41,7 @@ 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 = [ @@ -73,13 +69,15 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 9af2f051e70e31802f590c12406735caa4edf07c..55f1a11539a906d201a8211beafe4cc1c39a6a53 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 @@ -13,14 +13,12 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") 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", @@ -31,9 +29,6 @@ ohos_shared_library("libdinput_collector") { "//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 +45,16 @@ 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", ] 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..1d444c0a419b7695fca16d2bab3a9cc0f5460749 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../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", @@ -41,14 +40,11 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "//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,7 +63,6 @@ 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", @@ -76,6 +71,10 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { 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/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index c0ff44535cb74f10f31758bf2bb85bd6551efc9d..097f9bc9c193be0f56f340c342cfd356be03e8d1 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ohos_shared_library("libdinput_sink") { include_dirs = [ @@ -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,7 @@ 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/" + "//third_party/libevdev/libevdev/", ] sources = [ @@ -66,22 +54,25 @@ ohos_shared_library("libdinput_sink") { 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", - "//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", + "${innerkits_path}:libdinput_sdk", + "${services_sink_path}/inputcollector:libdinput_collector", + "${services_sink_path}/transport:libdinput_sink_trans", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "config_policy:configpolicy_util", + "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..617a8d2c1bc90268cb40a893ab41635a39763c98 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../distributedinput.gni") module_out_path = "distributed_input/sink_manager" @@ -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", @@ -46,28 +44,13 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${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 +58,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", + "${services_sink_path}/sinkmanager/test/sinkmanagerunittest/mock/mock_process.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}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", "distributed_input_sinkmanager_test.cpp", ] @@ -100,30 +82,32 @@ 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", "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${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", + "${services_sink_path}/transport:libdinput_sink_trans", + "${distributedinput_path}/services/transportbase:libdinput_trans_base", "//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", + "config_policy:configpolicy_util", + "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..d7079d54d1d55c5a6439cbdae8870f7f4d212f2f 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 @@ -13,14 +13,12 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") 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,8 @@ 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 = [ @@ -57,16 +51,18 @@ ohos_shared_library("libdinput_sink_trans") { "${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", + "${distributedinput_path}/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..56c826c3fde9bac676406f1e08ad8f59c53dbfc3 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../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", @@ -43,34 +42,23 @@ ohos_unittest("distributed_input_sinktrans_test") { "//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", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${services_sink_path}/sinkmanager/src/distributed_input_sink_manager.cpp", + "${distributedinput_path}/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", @@ -96,19 +84,21 @@ ohos_unittest("distributed_input_sinktrans_test") { "${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", "//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..09db6fec231713e5b7f4277293f43eb5e88385fb 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 @@ -13,15 +13,13 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ohos_shared_library("libdinput_inject") { include_dirs = [ "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,9 +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/" ] @@ -63,6 +58,9 @@ ohos_shared_library("libdinput_inject") { 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..0157a41d52b0ea1d5dd2a0698c40c528f91f4805 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../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", @@ -44,25 +41,20 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${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", + "${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", "${common_path}/test/mock/softbus_bus_center_mock.cpp", ] @@ -87,13 +79,16 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${utils_path}:libdinput_utils", "//third_party/openssl:libcrypto_static", "//third_party/libevdev:libevdev", - "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", + "${innerkits_path}:libdinput_sdk", ] 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..47781766fa5cbc89aaad2edee4088879b79fc82c 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 @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ohos_shared_library("libdinput_source") { include_dirs = [ @@ -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", @@ -38,46 +36,42 @@ ohos_shared_library("libdinput_source") { "${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 +89,21 @@ ohos_shared_library("libdinput_source") { 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", - "//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", + "${innerkits_path}:libdinput_sdk", + "${services_source_path}/inputinject:libdinput_inject", + "${services_source_path}/transport:libdinput_source_trans", "//third_party/libevdev:libevdev", ] external_deps = [ "c_utils:utils", + "config_policy:configpolicy_util", + "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..620fa5b9a4d7f6bd44b8ac71deb3b845de59cb38 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../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", @@ -45,21 +44,15 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${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", ] @@ -87,14 +80,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", + "${distributedinput_path}/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_sourcemanager_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", @@ -120,19 +113,20 @@ ohos_unittest("distributed_input_sourcemanager_test") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//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", + "${services_source_path}/transport:libdinput_source_trans", ] 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..d749f3c34450abae4b8b43b56c1adb374debd401 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 @@ -13,14 +13,12 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") 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,12 @@ 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" ] @@ -53,15 +49,16 @@ ohos_shared_library("libdinput_source_trans") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "${services_source_path}/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", + "${distributedinput_path}/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/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 87ee625449e66e28dea904b5b835c7806159406c..6a8acf1937ab3b5526945d52d2c2db803e5b8657 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../../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", @@ -46,19 +45,17 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${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", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", + "${distributedinput_path}/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", @@ -84,13 +81,14 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager:libdinput_source", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "${services_source_path}/sourcemanager:libdinput_source", + "${services_source_path}/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..8b1f84483b85a733bf5884de2a8094cfa05db914 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 @@ -13,31 +13,25 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../distributedinput.gni") 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", ] @@ -58,15 +52,17 @@ ohos_shared_library("libdinput_trans_base") { "${fwk_interfaces_path}:libdhfwk_sdk", "${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", + "${services_source_path}/inputinject:libdinput_inject", ] 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..9e44dc86c85d73b37a6246eccbcf4b1cc22700b9 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../../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", @@ -46,16 +45,14 @@ ohos_unittest("distributed_input_transbase_test") { "//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", + "${services_source_path}/transport/src/distributed_input_source_transport.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_transport.cpp", + "${services_sink_path}/transport/src/distributed_input_sink_switch.cpp", + "${distributedinput_path}/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", @@ -82,12 +79,12 @@ ohos_unittest("distributed_input_transbase_test") { "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "${services_source_path}/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..99510ad38dd1a76f43fec9457d89e1f876a38a88 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 @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../distributedinput.gni") ohos_shared_library("libdinput_sink_handler") { include_dirs = [ @@ -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,14 +51,16 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index c4cf9a9db2693ccb2db7ca04320b221505a6b578..5fe8e20c75914cb995e500567a15ba15be5489d3 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../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..3f111cb445463f01a5e5b8d9ccf64a2feae6548c 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 @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../distributedinput.gni") ohos_shared_library("libdinput_source_handler") { include_dirs = [ @@ -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,8 +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/" ] @@ -57,15 +53,17 @@ 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", "samgr:samgr_proxy", + "safwk:system_ability_fwk", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index f50fab0b656a49565105de7cafd61a80aab6c3f2..af75840b19f5f6033bdf4dd4a00ef8608d04213a 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../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,13 @@ 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 +75,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..0c98104b8846abb0c25f2e7c6e03d10010862679 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 @@ -15,13 +15,13 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ##############################fuzztest########################################## 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,9 +33,6 @@ 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", @@ -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..f0c5dcdb23fb8d141580b737a5cecf1e858cd7f1 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 @@ -15,13 +15,13 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ##############################fuzztest########################################## 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,9 +33,6 @@ 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", @@ -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..d7f20bf009af279e24b777f0ba6f4ea2a307cb14 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 @@ -15,19 +15,17 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ##############################fuzztest########################################## 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", @@ -40,8 +38,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "//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,8 +47,8 @@ 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", ] @@ -61,15 +57,16 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "${dfx_utils_path}:libdinput_dfx_utils", "${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", + "${distributedinput_path}/services/transportbase:libdinput_trans_base", ] external_deps = [ "c_utils:utils", + "eventhandler:libeventhandler", "dsoftbus:softbus_client", + "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..71461c154a3996d54c9ca6c37b4cba7406bc05ec 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 @@ -15,21 +15,18 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ##############################fuzztest########################################## 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", @@ -42,11 +39,8 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "//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,7 +51,7 @@ 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", ] @@ -66,16 +60,18 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "${services_source_path}/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", + "${distributedinput_path}/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..b2b05485f7f83a7b5f29c74d0f1aa68b641baae4 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 @@ -15,21 +15,18 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") ##############################fuzztest########################################## 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", @@ -42,11 +39,8 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "//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,7 +51,7 @@ 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", ] @@ -66,16 +60,18 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "${services_source_path}/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", + "${distributedinput_path}/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..0a120f992991c9d0599f70b2a994f8c81b175f97 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../distributedinput.gni") ohos_shared_library("libdinput_utils") { include_dirs = [ @@ -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 = [ @@ -54,10 +51,12 @@ ohos_shared_library("libdinput_utils") { ] external_deps = [ - "dsoftbus:softbus_client", - "samgr:samgr_proxy", "c_utils:utils", + "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", + "hisysevent_native:libhisysevent", + "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..3e7d1326a69b0e7354e36c3a607b86dfb750078f 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 @@ -13,7 +13,8 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributed_input/distributedinput.gni") + "../../../distributedinput.gni") + module_out_path = "distributed_input/utils" group("unittest") { @@ -36,13 +37,10 @@ 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 = [ @@ -74,9 +72,11 @@ ohos_unittest("distributed_input_utils_test") { ] external_deps = [ - "samgr:samgr_proxy", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", + "hisysevent_native:libhisysevent", + "ipc:ipc_core", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ]