diff --git a/bundle.json b/bundle.json index e0bd4b12a3cafef6fd2ac46c4908ae0dde12ec14..ebc2d1e910395973792e72ee4296959039d7e215 100755 --- a/bundle.json +++ b/bundle.json @@ -31,6 +31,7 @@ "eventhandler", "hilog", "ipc", + "json", "safwk", "samgr", "dsoftbus", @@ -41,13 +42,10 @@ "hisysevent", "hitrace", "graphic_surface", - "window_manager" - ], - "third_party": [ - "jsoncpp", - "libevdev", + "window_manager", "openssl" - ] + ], + "third_party": [ "libevdev" ] }, "build": { "sub_component": [ diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index fedf15fb5d535e5f9e3319cab6796e3508d07423..91e7ec305345dc8b1dd559f6714d14cdd3fee417 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -33,10 +33,7 @@ ohos_unittest("distributed_input_white_list_test") { "${services_sink_path}/transport/include", "${frameworks_path}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", - "//third_party/json/include", "${utils_path}/include", ] @@ -64,10 +61,12 @@ ohos_unittest("distributed_input_white_list_test") { external_deps = [ "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 7e020bc616a48d2a76411be6344c721067077371..00315730e8d53e6ee2639a9e33971b1ce64f82a9 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -28,8 +28,6 @@ ohos_shared_library("libdinput_dfx_utils") { include_dirs = [ "include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${frameworks_path}/include", "${dfx_utils_path}/include", "${service_common}/include", @@ -51,6 +49,7 @@ ohos_shared_library("libdinput_dfx_utils") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index 79e3337c149259549ca80561378e2e1c4cc88398..70bf4dfc1c82914a4aa394bb0da05ed6975dd5de 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -30,9 +30,6 @@ ohos_unittest("distributed_input_dfx_test") { include_dirs = [ "include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${frameworks_path}/include", "${dfx_utils_path}/include", "${service_common}/include", @@ -63,6 +60,7 @@ ohos_unittest("distributed_input_dfx_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 4d171b6fcaa0793df3bc3c7e424719485a73a7d2..6dba80c9336da2821bcacd97dfa25bcea9579689 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -26,18 +26,12 @@ ohos_shared_library("libdinput_handler") { } branch_protector_ret = "pac_ret" include_dirs = [ - "${av_transport_path}/common/include", "include", "${common_path}/include", "${services_state_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", "${frameworks_path}/include", "${utils_path}/include", - "//third_party/json/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", ] sources = [ @@ -55,14 +49,19 @@ ohos_shared_library("libdinput_handler") { "${services_state_path}:libdinput_sink_state", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index 9388098d116ea99435f3dbf4bd990576ca5b930c..5935ca9c5c2f51ba0f9faf1647edff6a5bb6c0ed 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -28,17 +28,11 @@ ohos_unittest("distributed_input_handler_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${common_path}/include", "${services_state_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", "${frameworks_path}/include", "${utils_path}/include", - "//third_party/json/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", ] @@ -65,14 +59,19 @@ ohos_unittest("distributed_input_handler_test") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 92bc5d8f1385c223ec57b3caef7d9be630381fbd..2c77853b5491b410bacad467680c45a73a2efb34 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -16,19 +16,13 @@ import("../../distributedinput.gni") config("input_sdk_public_config") { include_dirs = [ - "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] } ohos_shared_library("libdinput_sdk") { @@ -43,6 +37,14 @@ ohos_shared_library("libdinput_sdk") { branch_protector_ret = "pac_ret" public_configs = [ ":input_sdk_public_config" ] + public_external_deps = [ + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", + "json:nlohmann_json_static", + ] + sources = [ "${common_path}/include/input_check_param.cpp", "${common_path}/include/white_list_util.cpp", diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index 8e373278078ae291af080a5d9719de982fa6479b..07c7aaf460c58aac0146c127be01a3b280b1dbf0 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("distributed_input_inner_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", @@ -36,12 +35,7 @@ ohos_unittest("distributed_input_inner_test") { "${distributedinput_path}/services/include", "${frameworks_path}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${utils_path}/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${frameworks_path}/include", ] @@ -102,9 +96,14 @@ ohos_unittest("distributed_input_inner_test") { external_deps = [ "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 2a92b501a96cd41a8111a72ab548232f7b40b62d..a4e88ea9df5c7d120ee3d39926e2f82bfe33d59b 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("add_white_list_infos_callbackl_test") { include_dirs = [ "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", @@ -39,7 +37,6 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -97,11 +94,13 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "access_token:libtoken_setproc", "access_token:libtokenid_sdk", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index da8b90c3840055227ca530539c4c8c8985a82eb1..b12b9b95a17aadc752f016f9a1c2af2395b1706b 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -28,19 +28,13 @@ ohos_unittest("distributed_input_client_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", "${services_source_path}/sourcemanager/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", @@ -120,12 +114,16 @@ ohos_unittest("distributed_input_client_test") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index ff56334d761ca4e1782e5b84cfe6c5351dadc54b..eebbae10fe83354be486ce3b506d5304bfdb8f73 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("del_white_list_infos_callbackl_test") { include_dirs = [ "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", @@ -39,7 +37,6 @@ ohos_unittest("del_white_list_infos_callbackl_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -69,11 +66,13 @@ ohos_unittest("del_white_list_infos_callbackl_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index 73a3dbfe64f2ba22b976bef4da4002b5bb985dbb..1d134a56364769811ab4fe7a92c2845d9c089d06 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("dinput_source_callback_test") { include_dirs = [ "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", @@ -39,7 +37,6 @@ ohos_unittest("dinput_source_callback_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -97,11 +94,13 @@ ohos_unittest("dinput_source_callback_test") { "access_token:libtoken_setproc", "access_token:libtokenid_sdk", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 4a9cdaf1ee0508f5328ce168cf4a80c48eb88a70..1a566b4316cd29c57d7bf7cf893d72525e035d68 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -28,19 +28,13 @@ ohos_unittest("distributed_input_ipc_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -107,11 +101,15 @@ ohos_unittest("distributed_input_ipc_test") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 49ffca92a862f042b8f7aa4aa3ba4877795fe0a2..7091aae4ed0426080072b3da4eed990d9fbde0e3 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("unprepare_d_input_call_back_test") { include_dirs = [ "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", @@ -39,7 +37,6 @@ ohos_unittest("unprepare_d_input_call_back_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -69,11 +66,13 @@ ohos_unittest("unprepare_d_input_call_back_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 7b0db14f52f83c1a59b5075626b389346d86a4d2..9f28278e00637fb83a19f167ff156a4454f31187 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("unregister_d_input_call_back_test") { include_dirs = [ "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", @@ -39,7 +37,6 @@ ohos_unittest("unregister_d_input_call_back_test") { "${ipc_path}/include", "${ipc_path}/src", "${utils_path}/include", - "//third_party/json/include", ] sources = [ @@ -69,11 +66,13 @@ ohos_unittest("unregister_d_input_call_back_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 2078145ac859c4a215e948e3641e4d2f029848f1..d19d7d9d9a316320043711736e05f11938a71629 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//build/ohos/sa_profile/sa_profile.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") ohos_sa_profile("distributed_input_source_sa_profile") { sources = [ "4809.json" ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 84d81c77f3a697775c0e350bdf2977bd9c9aed9d..02a9b765c9110a501706e33be0cd742e5679bab1 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -26,17 +26,11 @@ ohos_shared_library("libdinput_collector") { } branch_protector_ret = "pac_ret" include_dirs = [ - "${av_transport_path}/common/include", "include", "${common_path}/include", "${services_state_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${utils_path}/include", - "//third_party/json/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", ] sources = [ @@ -54,14 +48,19 @@ ohos_shared_library("libdinput_collector") { "${services_state_path}:libdinput_sink_state", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index 9980187a69f107568e265f2569e40f7654b1febb..b45903250742a3c92e8f371574c3334e758973ff 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -28,17 +28,11 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${services_sink_path}/inputcollector/include", "${common_path}/include", "${services_state_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${utils_path}/include", - "//third_party/json/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", ] sources = [ @@ -65,14 +59,19 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "${services_state_path}:libdinput_sink_state", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 17e4191c5a550e04d0f43244213d35f33eedf90e..97328a62d852b91dceb5182e31bf8ca3b77caacd 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -26,7 +26,6 @@ ohos_shared_library("libdinput_sink") { } branch_protector_ret = "pac_ret" include_dirs = [ - "${av_transport_path}/common/include", "include", "${frameworks_path}/include", "${innerkits_path}/include", @@ -34,16 +33,11 @@ ohos_shared_library("libdinput_sink") { "${ipc_path}/include", "${ipc_path}/src", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", "${services_sink_path}/transport/include", "${services_sink_path}/inputcollector/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/services/state/include", "${distributedinput_path}/services/transportbase/include", ] @@ -77,12 +71,16 @@ ohos_shared_library("libdinput_sink") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index fd25b197bd21fac3e47d11afb4c00b1192197511..cbe3500effce092b5887fce471a0dbab7755a8cf 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -34,7 +34,6 @@ ohos_unittest("distributed_input_sinkmanager_test") { } include_dirs = [ - "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", @@ -45,15 +44,10 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${frameworks_path}/include", "${common_path}/include", "${services_state_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", - "//third_party/json/include", "${services_sink_path}/inputcollector/include", "${dfx_utils_path}/include", "${utils_path}/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${common_path}/test/mock", "${services_sink_path}/sinkmanager/test/sinkmanagerunittest/mock/", "${distributedinput_path}/services/state/include", @@ -97,7 +91,6 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${services_sink_path}/transport:libdinput_sink_trans", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ @@ -106,6 +99,9 @@ ohos_unittest("distributed_input_sinkmanager_test") { "access_token:libtoken_setproc", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", @@ -113,6 +109,8 @@ ohos_unittest("distributed_input_sinkmanager_test") { "hicollie:libhicollie", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index e950a14d2e9c9c8ec9914f9dcc20197de6aab9eb..21797428d112e2a1625ac00f9a471af0a1d8bbfe 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -26,18 +26,12 @@ ohos_shared_library("libdinput_sink_trans") { } branch_protector_ret = "pac_ret" include_dirs = [ - "${av_transport_path}/common/include", "include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${service_common}/include", "${dfx_utils_path}/include", "${utils_path}/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/services/transportbase/include", ] @@ -61,6 +55,9 @@ ohos_shared_library("libdinput_sink_trans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", @@ -68,6 +65,7 @@ ohos_shared_library("libdinput_sink_trans") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 7b2a29c8002a2c75b7b6bf017e09c6d8a71781c5..7fa4778726283fedfc09f357989f23a502a7aabe 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -28,21 +28,15 @@ ohos_unittest("distributed_input_sinktrans_test") { module_out_path = module_out_path include_dirs = [ - "${av_transport_path}/common/include", "${services_sink_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${frameworks_path}/include", - "${fwk_interfaces_path}/include", "${service_common}/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${common_path}/test/mock", "${services_sink_path}/sinkmanager/include", - "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", @@ -88,6 +82,9 @@ ohos_unittest("distributed_input_sinktrans_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_surface:surface", @@ -96,6 +93,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 7382de407e93c2cc3e8a62128c409551811e9d8c..2baf5a839b13d31b066badb04a1dbeff0a1ed692 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -26,19 +26,13 @@ ohos_shared_library("libdinput_inject") { } branch_protector_ret = "pac_ret" include_dirs = [ - "${av_transport_path}/common/include", "include", "${common_path}/include", "${services_state_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", - "${fwk_interfaces_path}/include", - "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", ] @@ -60,15 +54,20 @@ ohos_shared_library("libdinput_inject") { "${services_state_path}:libdinput_sink_state", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index cfe970adf1b9894568133df5d0e19c5eb2570d55..0654c26d6c787c6f5e781df396d1928200991949 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -36,10 +36,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${common_path}/include", "${services_state_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", @@ -78,15 +75,17 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${innerkits_path}:libdinput_sdk", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 2ff784ab9e36c5682046f7094e74d1f183f4d1fd..cc0ad122b37faedc37838ce1b22382bbcaad3eb6 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -34,14 +34,11 @@ ohos_shared_library("libdinput_source") { "${ipc_path}/include", "${ipc_path}/src", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${dfx_utils_path}/include", "${utils_path}/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${distributedinput_path}/inputdevicehandler/include", @@ -113,6 +110,7 @@ ohos_shared_library("libdinput_source") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", @@ -121,6 +119,7 @@ ohos_shared_library("libdinput_source") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index c7d1708b9994495d2cfa3d946cbdea41dbf021f9..e9619e3b93690cb9092b8e20aae88b3c48b7683b 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -38,10 +38,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${distributedinput_path}/inputdevicehandler/include", "${common_path}/include", "${services_state_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", - "//third_party/json/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${dfx_utils_path}/include", @@ -116,7 +113,6 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${services_source_path}/transport:libdinput_source_trans", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ @@ -125,6 +121,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "access_token:libtoken_setproc", "access_token:libtokenid_sdk", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hicollie:libhicollie", @@ -132,6 +129,8 @@ ohos_unittest("distributed_input_sourcemanager_test") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index df26387f31738f7a2ce202156f65388225b05af7..0d02facf2defd4c982b9f6d2e9852133c5fb050e 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -29,10 +29,7 @@ ohos_shared_library("libdinput_source_trans") { "${av_transport_path}/common/include", "include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "//third_party/json/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${dfx_utils_path}/include", @@ -60,10 +57,12 @@ ohos_shared_library("libdinput_source_trans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 1630fa1877ad084aabd84ce6cab23aa1a6f41192..9063289e3feaf031f1f05e368074232afaca4619 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -33,12 +33,9 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${service_common}/include", - "//third_party/json/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${services_source_path}/sourcemanager/include", @@ -84,10 +81,12 @@ ohos_unittest("distributed_input_sourcetrans_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", + "json:nlohmann_json_static", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 70b6ba7bacfb6c7417e9138436a8d98922b8836a..4ee2c0af14ffe4dc6291d7e29a0661007fe5b773 100644 --- a/services/state/BUILD.gn +++ b/services/state/BUILD.gn @@ -35,7 +35,6 @@ ohos_shared_library("libdinput_sink_state") { "${services_source_path}/inputinject/include", "${services_sink_path}/transport/include", "${frameworks_path}/include", - "${fwk_common_path}/utils/include", ] sources = [ @@ -59,6 +58,7 @@ ohos_shared_library("libdinput_sink_state") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/state/test/dinpusinkstatetest/BUILD.gn b/services/state/test/dinpusinkstatetest/BUILD.gn index 77bde9073128bccdd7d0f74b3535654918bd94b6..7666fc21d7103c7af63f0bfdc0b3caf0c3279c87 100644 --- a/services/state/test/dinpusinkstatetest/BUILD.gn +++ b/services/state/test/dinpusinkstatetest/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("dinput_sink_state_test") { include_dirs = [ "${common_path}/include", - "${fwk_common_path}/utils/include", "${services_state_path}/include", ] @@ -54,6 +53,7 @@ ohos_unittest("dinput_sink_state_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "hilog:libhilog", ] diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 3ae870ad5baec6d092ee3882d96567b72cd6c96d..8f67ed65c82c610dbbe39b51627575f6497c95cb 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -30,9 +30,6 @@ ohos_shared_library("libdinput_trans_base") { "include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${service_common}/include", "${dfx_utils_path}/include", "${utils_path}/include", @@ -58,12 +55,14 @@ ohos_shared_library("libdinput_trans_base") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index 2552d84eec0ee199fa52edc5582deb13e51bd386..0d5d07fb4fa45070892489693035c0e750f65674 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -34,14 +34,11 @@ ohos_unittest("distributed_input_transbase_test") { "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${fwk_interfaces_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", - "//third_party/json/include", "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/state/include", "${common_path}/test/mock", @@ -82,12 +79,14 @@ ohos_unittest("distributed_input_transbase_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "hicollie:libhicollie", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index c0d3649ec81ea319ba650143a0dbafdb7c721688..57451174981e9d8ef5ea07ea63740059851d6250 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -35,8 +35,6 @@ ohos_shared_library("libdinput_sink_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", @@ -62,6 +60,7 @@ ohos_shared_library("libdinput_sink_handler") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 29835a8940c56c959d3412fe3b6cc5e0f6faf77a..51356ca9d2acc92e7226c62aea85466f287ea265 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -37,9 +37,6 @@ ohos_unittest("distributed_input_sink_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", @@ -76,10 +73,12 @@ ohos_unittest("distributed_input_sink_handler_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 297d63dce4e37b17086b97236d166b8b9e5a7273..e068830b30bca1d82d1e3ee0baba3f032543c3f5 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -35,8 +35,6 @@ ohos_shared_library("libdinput_source_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", @@ -65,6 +63,7 @@ ohos_shared_library("libdinput_source_handler") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 74cd486529af30c9948febd221766b8c079de79b..37fdad9d606b0f2085af33cce1d1824f10009ced 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -37,9 +37,6 @@ ohos_unittest("distributed_input_source_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", @@ -78,10 +75,12 @@ ohos_unittest("distributed_input_source_handler_test") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", + "json:nlohmann_json_static", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn index 420f26b7aae21bdf009bd04cd846664b410eea5e..dff45f9c43d1a76ea19d77119a6723e12e96a111 100644 --- a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn @@ -36,9 +36,6 @@ ohos_fuzztest("DinputConfigDhFuzzTest") { "${distributedinput_path}/services/state/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -61,10 +58,12 @@ ohos_fuzztest("DinputConfigDhFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn index 646504bb6f71c89670e9338edfe2b11a91b83f26..8792b614abc1b63f56bcafbb8c1e5c939f05c1e9 100644 --- a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn @@ -34,9 +34,6 @@ ohos_fuzztest("DinputInitSinkFuzzTest") { "${distributedinput_path}/inputdevicehandler/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -59,10 +56,12 @@ ohos_fuzztest("DinputInitSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn index 91480f69405f145a4480cf891deb712297980342..0a112f42cc988156a57f6ec39587e3447edd63fe 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn @@ -36,9 +36,6 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { "${distributedinput_path}/inputdevicehandler/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -61,10 +58,12 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn index d4d0b60f22e75b8107ad981aba77a49e03519081..fb7229f0dddbf101cefbb1251e8ec69752106f5a 100644 --- a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn @@ -28,13 +28,10 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") { "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", @@ -60,12 +57,14 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn index 05431bc970050eedb2db36ff6aab5025e90f8903..fc9bb379ab2d29d84a3edfc62be8ad98ab6fc538 100644 --- a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn @@ -28,13 +28,10 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") { "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", @@ -60,12 +57,14 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn index 946bddf0fd36cd345c90f667451a12fa42705b25..22a131fb2772713d0440080cb920c4db52839282 100644 --- a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn @@ -34,9 +34,6 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") { "${distributedinput_path}/inputdevicehandler/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -59,10 +56,12 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn index 850f303d8051e58226e1a4b44474a087579aa23b..c67a710f5aa4c9ae74b1f15a43374e9a95b0dc4e 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn @@ -36,9 +36,6 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { "${distributedinput_path}/services/state/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -61,10 +58,12 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn index 1c323471009191c57a7fc5113d1a945a5586d637..d4dc074dc1e4c91e0379cc3a06fea11929bf77a8 100644 --- a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn @@ -34,9 +34,6 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") { "${distributedinput_path}/inputdevicehandler/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -59,10 +56,12 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index 27ee6aa965264ea3caf5be8982974afae7cbc22e..e4b57ca6a80b100127c3ae82fe4955eb0292f501 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -38,9 +38,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/services/state/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${services_source_path}/inputinject/include", @@ -63,10 +60,12 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 0639b38d31656a7909f31420b1c1aed454c031a9..4e0b80400da2b9ec6bb5b31cbc475367115e515f 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -36,9 +36,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${distributedinput_path}/inputdevicehandler/include", "${service_common}/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "//third_party/json/include", "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", @@ -62,9 +59,11 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", ] defines = [ diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index ae52e14d423170b003f16013c4a73186edc10462..62bcd36daf8138cb61d5229b991fb77a444c90f7 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -29,11 +29,8 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "${distributedinput_path}/services/transportbase/include", "${common_path}/include", "${frameworks_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${service_common}/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", ] @@ -59,12 +56,14 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hicollie:libhicollie", "hilog:libhilog", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index c1e3b941aadf9c6983275fa7b57bae83a8edcc21..398b83ada3c42644b91f97db8420e3eed9e0bd0d 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -28,13 +28,10 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", @@ -64,12 +61,14 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index 3afc87b4a172875ab5736c1a7ea6852ea8205c4e..cbc33419fd6d941d742da6d927cebf273d69e906 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -28,13 +28,10 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", - "//third_party/json/include", "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", @@ -63,12 +60,14 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "json:nlohmann_json_static", "safwk:system_ability_fwk", ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index d293f85bf98c6b728322dd64b9355f8c4245ba7d..7fe960ed338012ee582b91278cf5f3a7664ed496 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -27,13 +27,9 @@ ohos_shared_library("libdinput_utils") { branch_protector_ret = "pac_ret" include_dirs = [ "${av_transport_path}/common/include", - "${fwk_common_path}/utils/include", - "${fwk_common_path}/log/include", - "//third_party/json/include", "${utils_path}/include", "${common_path}/include", "${service_common}/include", - "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${dfx_utils_path}/include", @@ -51,15 +47,16 @@ ohos_shared_library("libdinput_utils") { "LOG_DOMAIN=0xD004120", ] - deps = [ "//third_party/openssl:libcrypto_shared" ] - external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "samgr:samgr_proxy", ] diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 39cd320677e79b195b777d7ba33918475934a754..8e736870d970f0d31cc2db934783ea3cf4b2333b 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -29,15 +29,12 @@ ohos_unittest("distributed_input_utils_test") { include_dirs = [ "${av_transport_path}/common/include", - "${fwk_common_path}/utils/include", - "${fwk_common_path}/log/include", "${utils_path}/include", "${utils_path}/test/unittest", "${common_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${frameworks_path}/include", - "//third_party/json/include", "${common_path}/test/mock", "${service_common}/include", ] @@ -64,17 +61,17 @@ ohos_unittest("distributed_input_utils_test") { "LOG_DOMAIN=0xD004120", ] - deps = [ - "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_shared", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", + "json:nlohmann_json_static", + "openssl:libcrypto_shared", "samgr:samgr_proxy", ]