diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index e0f85e6fdbdbd999194ac8cc0c752bcb9c555546..0de31d963d4d8eb399c5d5aa17ba5785658a9794 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -19,11 +19,7 @@ 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", "${utils_path}/include", ] @@ -45,9 +41,6 @@ ohos_shared_library("libdinput_dfx_utils") { "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/dfx_utils/include/hidumper.h b/dfx_utils/include/hidumper.h index c5bb91c1b5d7e61702346066e9327ffe0b443edf..339a02f5d537867b3665595b50483f791047dba0 100644 --- a/dfx_utils/include/hidumper.h +++ b/dfx_utils/include/hidumper.h @@ -22,9 +22,6 @@ #include #include -#include -#include - #include "constants_dinput.h" #include "single_instance.h" diff --git a/dfx_utils/src/hidumper.cpp b/dfx_utils/src/hidumper.cpp index a7febfc0a7f2af547347ac87dd5be7ef941b3a2a..4807ebfa1d664e897e54b75d15a1e09159af73f3 100644 --- a/dfx_utils/src/hidumper.cpp +++ b/dfx_utils/src/hidumper.cpp @@ -17,7 +17,6 @@ #include "dinput_errcode.h" #include "dinput_log.h" -#include "dinput_softbus_define.h" #include "dinput_utils_tool.h" namespace OHOS { diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index feb3ce8fb0cb4f81bca268a22cddd85c0256f5c4..6d0df1db14f9ffa47f02ad17ead1ba4558675a85 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -28,14 +28,9 @@ ohos_unittest("distributed_input_dfx_test") { module_out_path = module_out_path 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", "${utils_path}/include", ] @@ -66,9 +61,6 @@ ohos_unittest("distributed_input_dfx_test") { "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/dfx_utils/test/dfxtest/distributed_input_dfx_test.cpp b/dfx_utils/test/dfxtest/distributed_input_dfx_test.cpp index f3521de99a6618221ad84a5e90471866aa6192df..ed89fd95e33fd912959fb8d37b45c1c1bdbec26f 100644 --- a/dfx_utils/test/dfxtest/distributed_input_dfx_test.cpp +++ b/dfx_utils/test/dfxtest/distributed_input_dfx_test.cpp @@ -15,8 +15,7 @@ #include "distributed_input_dfx_test.h" -#include "system_ability_definition.h" - +#include "constants_dinput.h" #include "dinput_errcode.h" #include "hidumper.h" #include "hisysevent_util.h" diff --git a/dfx_utils/test/dfxtest/distributed_input_dfx_test.h b/dfx_utils/test/dfxtest/distributed_input_dfx_test.h index c8c3ccc3d68b6b1eb15dc65648041f76e10308a5..075e4943f0c01bf8223036a4dc7e2b8363ae39bd 100644 --- a/dfx_utils/test/dfxtest/distributed_input_dfx_test.h +++ b/dfx_utils/test/dfxtest/distributed_input_dfx_test.h @@ -16,17 +16,7 @@ #ifndef DISRIBUTED_INPUT_DFX_UTILS_TEST_H #define DISRIBUTED_INPUT_DFX_UTILS_TEST_H -#include -#include -#include -#include - #include -#include "ipc_skeleton.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" - -#include "constants_dinput.h" namespace OHOS { namespace DistributedHardware { diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 53a5bc6f366d34d1ac629a4a8e72f9973380b608..a5849783238bf931bbdd28ef13322bb63acb42b0 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -20,14 +20,12 @@ ohos_shared_library("libdinput_handler") { "${av_transport_path}/common/include", "include", "${common_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 = [ @@ -44,15 +42,11 @@ ohos_shared_library("libdinput_handler") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] 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/include/distributed_input_handler.h b/inputdevicehandler/include/distributed_input_handler.h index 16087a89cbe20ee68c79ce5ff683260edfe4fdd5..9fbca4f20fbfa761ebe5bc52e9969f94d8d80122 100644 --- a/inputdevicehandler/include/distributed_input_handler.h +++ b/inputdevicehandler/include/distributed_input_handler.h @@ -21,13 +21,9 @@ #include #include -#include -#include - #include "ihardware_handler.h" #include "single_instance.h" -#include "constants_dinput.h" #include "input_hub.h" #ifndef API_EXPORT diff --git a/inputdevicehandler/src/distributed_input_handler.cpp b/inputdevicehandler/src/distributed_input_handler.cpp index 6c0a5f0bd3cfa566b76dd6001410f42f53b4990d..ffa5ace499c59634230fc67ec208af2681f0fe8b 100644 --- a/inputdevicehandler/src/distributed_input_handler.cpp +++ b/inputdevicehandler/src/distributed_input_handler.cpp @@ -15,27 +15,19 @@ #include "distributed_input_handler.h" -#include -#include -#include + #include #include #include #include - -#include -#include -#include -#include - #include "nlohmann/json.hpp" +#include "softbus_bus_center.h" + #include "constants_dinput.h" #include "dinput_errcode.h" #include "dinput_log.h" -#include "dinput_softbus_define.h" #include "dinput_utils_tool.h" -#include "softbus_bus_center.h" namespace OHOS { namespace DistributedHardware { diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index be88283e7e5125ccf15314ddac22600249e3644a..7af8f101289c488b2b50364a95f4348ee95180ca 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -30,14 +30,12 @@ ohos_unittest("distributed_input_handler_test") { include_dirs = [ "${av_transport_path}/common/include", "${common_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", ] @@ -64,15 +62,11 @@ 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", "dsoftbus:softbus_client", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.cpp b/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.cpp index 979a5cd667c94b8849cf6f1a95ef81e066a7ebf3..2a64c8ebeaef776c22f7cc373397ff76373c01a4 100644 --- a/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.cpp +++ b/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.cpp @@ -15,8 +15,7 @@ #include "distributed_input_handler_test.h" -#include "system_ability_definition.h" - +#include "constants_dinput.h" #include "dinput_errcode.h" #include "distributed_input_handler.h" diff --git a/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.h b/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.h index 972e03b1fe7e1d8372022370d4ebd08d0c73871a..6c9caa63def732d2fd9828cc497965417c53da13 100644 --- a/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.h +++ b/inputdevicehandler/test/inputhandlertest/distributed_input_handler_test.h @@ -16,17 +16,7 @@ #ifndef DISRIBUTED_INPUT_HANDLER_TEST_H #define DISRIBUTED_INPUT_HANDLER_TEST_H -#include -#include -#include -#include - #include -#include "ipc_skeleton.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" - -#include "constants_dinput.h" namespace OHOS { namespace DistributedHardware { diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 4900ec4415fe5b8d6fd50019badf628d0e0990c5..8bf770ef86ee555ff7706c72f25a538648544beb 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -19,14 +19,10 @@ config("input_sdk_public_config") { "${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", ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index c8ca0629fbddb57ee5aed94c4c07478683931b8e..8c097a02115a833bbd9f1f46fcaa3a116a8c2a66 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -30,19 +30,13 @@ ohos_unittest("distributed_input_inner_test") { include_dirs = [ "${av_transport_path}/common/include", "${innerkits_path}/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", - "${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", ] sources = [ diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index eecbd186186e775c7c31cc54ab3eaca64793bd6a..9360ad6d679e9ee74e603ca9ba720ac7cceda762 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -30,14 +30,10 @@ 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", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${utils_path}/include", "//third_party/json/include", ] @@ -86,17 +82,13 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 4a838f5785b764882536724e09cb8dbd2554f335..4b385816965fcb506cde64bbf08aadda111200f0 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -31,24 +31,17 @@ ohos_unittest("distributed_input_client_test") { "${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", "${service_common}/include", - "${services_sink_path}/transport/include", - "${services_sink_path}/inputcollector/include", "${services_sink_path}/sinkmanager/include", - "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/state/include", ] @@ -107,9 +100,7 @@ ohos_unittest("distributed_input_client_test") { ] deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", "${services_sink_path}/sinkmanager:libdinput_sink", - "${services_source_path}/inputinject:libdinput_inject", "${services_source_path}/sourcemanager:libdinput_source", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", @@ -121,7 +112,6 @@ ohos_unittest("distributed_input_client_test") { "c_utils:utils", "config_policy:configpolicy_util", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_2d:surface", "ipc:ipc_core", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index 061bcbb2e76eb032b2d02f5b45d3fac71ef7922f..f785cd0ec64823d444172950b8858d7b05b2e141 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -30,14 +30,8 @@ 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", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${utils_path}/include", "//third_party/json/include", ] @@ -62,19 +56,13 @@ ohos_unittest("del_white_list_infos_callbackl_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index 13dfbe5e4d8baba2e123bb88fdef04de12ba911c..bfee846963d7cdd3ca97213f911feca3985d8cf3 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -30,14 +30,10 @@ 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", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${utils_path}/include", "//third_party/json/include", ] @@ -86,21 +82,15 @@ ohos_unittest("dinput_source_callback_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 83145771ef751fccea8001f7a057d8a9472f3e89..311e8868222240a90e0edd702c636f15f47e407d 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -31,14 +31,9 @@ ohos_unittest("distributed_input_ipc_test") { "${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", ] @@ -97,10 +92,7 @@ ohos_unittest("distributed_input_ipc_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -108,7 +100,6 @@ ohos_unittest("distributed_input_ipc_test") { "c_utils:utils", "config_policy:configpolicy_util", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index b6b4b01c0f91ca5549bc9c52f5a1003bfb0bdbeb..4225aee6003e7d19f9ae2f342f90f333fdb1a2ee 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -30,14 +30,9 @@ 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", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${utils_path}/include", "//third_party/json/include", ] @@ -62,19 +57,13 @@ ohos_unittest("unprepare_d_input_call_back_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 8a54fb9f094be7efdff6e0de070371b17b93fa6c..2e648b004ec009f3e49f489412bb05876ca19583 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -30,14 +30,9 @@ 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", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${utils_path}/include", "//third_party/json/include", ] @@ -62,19 +57,13 @@ ohos_unittest("unregister_d_input_call_back_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 6e18351de9148668be5ea57a1dcba09b8b3581ae..b5b4b25451e389cca5a0ba9e5cd9cb8f6d14ae43 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -21,12 +21,10 @@ ohos_shared_library("libdinput_collector") { "include", "${common_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 = [ @@ -50,7 +48,6 @@ ohos_shared_library("libdinput_collector") { "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/sink/inputcollector/include/distributed_input_collector.h b/services/sink/inputcollector/include/distributed_input_collector.h index 952b685f4f8da9bb50749fe0e9d1a12709a596ea..b03d0b646afdfb55a815093d9acde1507d988b93 100644 --- a/services/sink/inputcollector/include/distributed_input_collector.h +++ b/services/sink/inputcollector/include/distributed_input_collector.h @@ -22,9 +22,6 @@ #include #include -#include -#include - #include "event_handler.h" #include "refbase.h" diff --git a/services/sink/inputcollector/src/distributed_input_collector.cpp b/services/sink/inputcollector/src/distributed_input_collector.cpp index 3f60ca8f9c6fbf4437b7e701d031cc529236e5b3..345ba113d62bd4960d0d3dd8f5d6db10fbab51a4 100644 --- a/services/sink/inputcollector/src/distributed_input_collector.cpp +++ b/services/sink/inputcollector/src/distributed_input_collector.cpp @@ -15,18 +15,11 @@ #include "distributed_input_collector.h" -#include -#include -#include #include #include #include #include -#include -#include -#include - #include "nlohmann/json.hpp" #include "dinput_errcode.h" diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index 286653c026110dc0bbcfce485036949d9660c3de..cbf98e3792ff44bec940f306e3d26a0e376afba3 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -32,12 +32,10 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "${services_sink_path}/inputcollector/include", "${common_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 = [ @@ -70,8 +68,6 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "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 6dc12809ad3f577cacc2972b655eb7a2deae3e8d..353c702d3c541dceb2722df0243dd1ab9e839855 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -21,11 +21,11 @@ ohos_shared_library("libdinput_sink") { "include", "${frameworks_path}/include", "${innerkits_path}/include", - "${innerkits_path}/src", + "${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", diff --git a/services/sink/sinkmanager/include/distributed_input_sink_manager.h b/services/sink/sinkmanager/include/distributed_input_sink_manager.h index f51a6d71cbd1cb8fec7561baa7c16eee5881bad7..82c2f2d56c263537659506b6c897b3345cfc4b86 100644 --- a/services/sink/sinkmanager/include/distributed_input_sink_manager.h +++ b/services/sink/sinkmanager/include/distributed_input_sink_manager.h @@ -16,7 +16,7 @@ #ifndef DISTRIBUTED_INPUT_SINK_MANAGER_SERVICE_H #define DISTRIBUTED_INPUT_SINK_MANAGER_SERVICE_H -#include +#include #include #include #include @@ -29,7 +29,6 @@ #include "publisher_listener_stub.h" #include "nlohmann/json.hpp" #include "screen.h" -#include "singleton.h" #include "system_ability.h" #include "system_ability_status_change_stub.h" diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index 27bd793c18cf2bca4f7a7576503c6586d6760bd7..48449946f792c3c8cb806b3b5b27bc58e02152a1 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -16,10 +16,8 @@ #include "distributed_input_sink_manager.h" #include -#include #include #include -#include #include "dinput_softbus_define.h" #include "distributed_hardware_fwk_kit.h" diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index 2ab18a6c2e178d55d78970df319553622d43bf13..a0d820436903284507a1a5e144c8bcf009033e40 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -30,15 +30,12 @@ ohos_unittest("distributed_input_sinkmanager_test") { include_dirs = [ "${av_transport_path}/common/include", "${innerkits_path}/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${distributedinput_path}/services/transportbase/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", "${service_common}/include", "//third_party/json/include", @@ -90,7 +87,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 = [ diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 240becf6eb213052c5f95a3b363c56ff9d9d3c5d..ad4868e88699196e40514f1325f4920b614a250a 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -21,14 +21,12 @@ ohos_shared_library("libdinput_sink_trans") { "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", ] diff --git a/services/sink/transport/include/distributed_input_sink_switch.h b/services/sink/transport/include/distributed_input_sink_switch.h index f2cb6b5305f377e46e8161ebd50007dea81be9b4..88d7fd141305f486858fe80348399d28a67669ed 100644 --- a/services/sink/transport/include/distributed_input_sink_switch.h +++ b/services/sink/transport/include/distributed_input_sink_switch.h @@ -17,7 +17,6 @@ #define DISTRIBUTED_INPUT_SINK_SWITCH_H #include -#include #include #include diff --git a/services/sink/transport/include/distributed_input_sink_transport.h b/services/sink/transport/include/distributed_input_sink_transport.h index 34b8162037a4b96e39125d9e8e514b5d34560b8e..f27829b33bd40d2b056ee2ff44dc34c0d8a0ffa3 100644 --- a/services/sink/transport/include/distributed_input_sink_transport.h +++ b/services/sink/transport/include/distributed_input_sink_transport.h @@ -17,7 +17,6 @@ #define DISTRIBUTED_INPUT_SINK_TRANSPORT_H #include -#include #include #include diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index af0e0ef9397da19c485cc9305201af6925c5566b..654b345427a83a6ab5239513a2141c75506fcdc7 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -17,10 +17,11 @@ #include -#include "linux/input.h" #include "distributed_hardware_fwk_kit.h" #include "securec.h" +#include "session.h" +#include "softbus_bus_center.h" #include "constants_dinput.h" #include "dinput_context.h" @@ -28,11 +29,8 @@ #include "dinput_log.h" #include "dinput_softbus_define.h" #include "dinput_utils_tool.h" -#include "hidumper.h" -#include "session.h" -#include "softbus_bus_center.h" - #include "distributed_input_transport_base.h" +#include "hidumper.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index e817dc58ae140bbd0216e662278761c52b4b29fd..7719fb00e4f1b2a557d5e75e06d7f3ea4997f1c7 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -32,7 +32,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "${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", @@ -44,12 +44,9 @@ ohos_unittest("distributed_input_sinktrans_test") { "${services_sink_path}/sinkmanager/include", "${fwk_interfaces_path}/include/ipc", "${innerkits_path}/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${services_sink_path}/inputcollector/include", "${services_source_path}/inputinject/include", - "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/state/include", ] diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 0c697350a1caebe14f689c17be98e5928ef34cd8..52aa23a19e47f3b599f7923954d408c21d09a826 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -21,16 +21,12 @@ ohos_shared_library("libdinput_inject") { "include", "${common_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", - "${distributedinput_path}/services/state/include", ] sources = [ @@ -50,7 +46,6 @@ ohos_shared_library("libdinput_inject") { "${dfx_utils_path}:libdinput_dfx_utils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ @@ -58,8 +53,6 @@ ohos_shared_library("libdinput_inject") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/include/distributed_input_inject.h b/services/source/inputinject/include/distributed_input_inject.h index bd93c557690e68bf8994cdf7648b50b73d0aec70..27cc44cb23a315bdf6cebb9ea5118f80b8e91072 100644 --- a/services/source/inputinject/include/distributed_input_inject.h +++ b/services/source/inputinject/include/distributed_input_inject.h @@ -21,7 +21,6 @@ #include #include "constants_dinput.h" -#include "distributed_input_handler.h" #include "distributed_input_node_manager.h" #include "i_input_node_listener.h" diff --git a/services/source/inputinject/src/distributed_input_inject.cpp b/services/source/inputinject/src/distributed_input_inject.cpp index ea4a948c7b609760057b2b42291484df1416b11b..a45eb5c41b7b01df9035feb341b3fcc90040c552 100644 --- a/services/source/inputinject/src/distributed_input_inject.cpp +++ b/services/source/inputinject/src/distributed_input_inject.cpp @@ -16,7 +16,6 @@ #include "distributed_input_inject.h" #include - #include "nlohmann/json.hpp" #include "dinput_errcode.h" diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index bdde0f5fd0ee3e37c9d8c8a8a7d81e2f91656df0..2f52b508eddea8866a11dc9a6d91a496f3190ee5 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -17,7 +17,6 @@ #include #include - #include #include "softbus_bus_center.h" diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index d0ad8520d7c02faa66c0ef195b4d90ea3a85beb4..5de2670c74c6743aa7c0f547586330329a80dd24 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -30,27 +30,22 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { include_dirs = [ "${av_transport_path}/common/include", "${innerkits_path}/include", - "${ipc_path}/include", "${services_source_path}/inputinject/include", "${frameworks_path}/include", "${common_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", "${common_path}/test/mock", ] sources = [ "${common_path}/include/input_hub.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", - "${distributedinput_path}/inputdevicehandler/src/distributed_input_handler.cpp", "${services_source_path}/inputinject/src/distributed_input_inject.cpp", "${services_source_path}/inputinject/src/distributed_input_node_manager.cpp", "${services_source_path}/inputinject/src/virtual_device.cpp", @@ -76,16 +71,12 @@ 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", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/test/sourceinjectunittest/distributed_input_sourceinject_test.cpp b/services/source/inputinject/test/sourceinjectunittest/distributed_input_sourceinject_test.cpp index 0c929bbde6780935046ac5edcf5d3a6627ee2432..024ff071c266b85f8d7018add7c5dd48ff3df149 100644 --- a/services/source/inputinject/test/sourceinjectunittest/distributed_input_sourceinject_test.cpp +++ b/services/source/inputinject/test/sourceinjectunittest/distributed_input_sourceinject_test.cpp @@ -20,14 +20,12 @@ #include #include #include - #include #include "event_handler.h" #include "nlohmann/json.hpp" #include "dinput_errcode.h" -#include "softbus_bus_center.h" using namespace testing::ext; using namespace OHOS::DistributedHardware::DistributedInput; diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 7bfd57f5b0654a657432195d10e62d2b0a34b001..fa0e447516bc8b8e7bd315acdf314c8506dfd4c6 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -19,13 +19,8 @@ ohos_shared_library("libdinput_source") { "${av_transport_path}/common/include", "include", "${frameworks_path}/include", - "${innerkits_path}/include", - "${innerkits_path}/include/ipc", - "${innerkits_path}/src", "${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", @@ -35,7 +30,6 @@ ohos_shared_library("libdinput_source") { "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/state/include", "${distributedinput_path}/services/transportbase/include", ] @@ -99,6 +93,7 @@ ohos_shared_library("libdinput_source") { "${services_source_path}/transport:libdinput_source_trans", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index f3b375562677f6c84db6e027391212ca1420a047..9eb493b41b2c17141ae99347b4700adb31cd158b 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -30,14 +30,10 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/ipc/include", - "${innerkits_path}/src", "${ipc_path}/include", - "${ipc_path}/src", "${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", "${service_common}/include", "//third_party/json/include", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 2c752ccd6d9682378f06ef009a58df5050182f0a..09f89a7330d91079a482d5d5e3ff25412d52950f 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -20,7 +20,6 @@ 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", @@ -29,7 +28,6 @@ ohos_shared_library("libdinput_source_trans") { "${dfx_utils_path}/include", "${utils_path}/include", "${frameworks_path}/include", - "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/transportbase/include", "${distributedinput_path}/services/state/include", ] diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 6242cfe61cd75c77cc51f38f3991b45ff032bf08..717d43d3570923ac84be9a53e7bd0543e6d104c5 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -33,21 +33,18 @@ 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", "${dfx_utils_path}/include", "${utils_path}/include", "${ipc_path}/include", "${frameworks_path}/include", "${distributedinput_path}/services/state/include", - "${distributedinput_path}/inputdevicehandler/include", "${common_path}/test/mock", ] diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 5ca8aafe437bee7d4bfef17ec5e4aac31796f37f..61392c50466445a244e09f964f6ae007add8b2a1 100644 --- a/services/state/BUILD.gn +++ b/services/state/BUILD.gn @@ -22,7 +22,6 @@ ohos_shared_library("libdinput_state") { "${utils_path}/include", "${service_common}/include", "${services_sink_path}/inputcollector/include", - "${distributedinput_path}/inputdevicehandler/include", "${services_source_path}/inputinject/include", "${services_sink_path}/transport/include", "${frameworks_path}/include", @@ -46,16 +45,7 @@ ohos_shared_library("libdinput_state") { "//third_party/libevdev:libevdev", ] - external_deps = [ - "c_utils:utils", - "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "hitrace:hitrace_meter", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + external_deps = [ "c_utils:utils" ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/state/include/dinput_state.h b/services/state/include/dinput_state.h index 623a74ec4f692beef813a72e7a9dd84662ba9ad3..a4d2c20079504608d1a82b3af82cd52c0ce98fdf 100644 --- a/services/state/include/dinput_state.h +++ b/services/state/include/dinput_state.h @@ -19,11 +19,12 @@ #include #include #include -#include -#include "constants_dinput.h" +#include #include "single_instance.h" +#include "constants_dinput.h" + namespace OHOS { namespace DistributedHardware { namespace DistributedInput { diff --git a/services/state/src/dinput_state.cpp b/services/state/src/dinput_state.cpp index 6c19bca820e7fe029e6b3c58c179689c5a19f153..9bf4f674912218d9ff695d08e5891cf3aa9ab5af 100644 --- a/services/state/src/dinput_state.cpp +++ b/services/state/src/dinput_state.cpp @@ -20,9 +20,7 @@ #include #include #include -#include -#include "constants_dinput.h" #include "dinput_errcode.h" #include "dinput_log.h" #include "dinput_utils_tool.h" @@ -157,7 +155,7 @@ void DInputState::SpecEventInject(const int32_t sessionId, const std::vector -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_source_handler.h" -#include "i_distributed_source_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn index bc4698a741f8ef38e4910c10588a2a6496e02165..4fa5a0935e418ca1ae8213dfe728ed2130384aa8 100644 --- a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn @@ -24,23 +24,8 @@ ohos_fuzztest("DinputInitSinkFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputinitsink_fuzzer" include_dirs = [ - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sinkhandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -57,13 +42,7 @@ ohos_fuzztest("DinputInitSinkFuzzTest") { "//third_party/libevdev:libevdev", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputinitsink_fuzzer/dinputinitsink_fuzzer.cpp b/test/fuzztest/dinputinitsink_fuzzer/dinputinitsink_fuzzer.cpp index fe87f39046b2d17b0a73614c8901f366567bb88e..3e3a752d620e4f40a214118c0fd72bb0f5ae0143 100644 --- a/test/fuzztest/dinputinitsink_fuzzer/dinputinitsink_fuzzer.cpp +++ b/test/fuzztest/dinputinitsink_fuzzer/dinputinitsink_fuzzer.cpp @@ -15,19 +15,7 @@ #include "dinputinitsink_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_sink_handler.h" -#include "i_distributed_sink_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn index e5370980d9c470f826464f0a2926b48ece3ac71d..8875652cc5729c34fd2bc8c9c473f498d3f6c543 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn @@ -24,25 +24,8 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputinitsource_fuzzer" include_dirs = [ - "${av_transport_path}/common/include", - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/services/state/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sourcehandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -59,13 +42,7 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { "//third_party/libevdev:libevdev", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputinitsource_fuzzer/dinputinitsource_fuzzer.cpp b/test/fuzztest/dinputinitsource_fuzzer/dinputinitsource_fuzzer.cpp index 98d71204b0650492bc045d50650aa826b6fe559f..ea72eb3777509f98764683be859e75773f82d3af 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/dinputinitsource_fuzzer.cpp +++ b/test/fuzztest/dinputinitsource_fuzzer/dinputinitsource_fuzzer.cpp @@ -15,19 +15,7 @@ #include "dinputinitsource_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_source_handler.h" -#include "i_distributed_source_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn index 3a7cfdb937aa193d9a0cc22d15312fa401019e24..03d5a6ab69abc3c8bad3a87e8d91943e718f1601 100644 --- a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn @@ -24,21 +24,11 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputonsessionclosed_fuzzer" include_dirs = [ - "${av_transport_path}/common/include", - "${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", - "${distributedinput_path}/inputdevicehandler/include", ] cflags = [ @@ -50,23 +40,10 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") { sources = [ "dinputonsessionclosed_fuzzer.cpp" ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${services_source_path}/inputinject:libdinput_inject", - "${utils_path}:libdinput_utils", - "//third_party/libevdev:libevdev", - ] + deps = + [ "${distributedinput_path}/services/transportbase:libdinput_trans_base" ] - external_deps = [ - "c_utils:utils", - "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "hitrace:hitrace_meter", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputonsessionclosed_fuzzer/dinputonsessionclosed_fuzzer.cpp b/test/fuzztest/dinputonsessionclosed_fuzzer/dinputonsessionclosed_fuzzer.cpp index 3ddaec74494d6d81d63912c59f4bafed65a35376..17b9907a03ad810dad89f7965ef09aec654a219e 100644 --- a/test/fuzztest/dinputonsessionclosed_fuzzer/dinputonsessionclosed_fuzzer.cpp +++ b/test/fuzztest/dinputonsessionclosed_fuzzer/dinputonsessionclosed_fuzzer.cpp @@ -15,14 +15,6 @@ #include "dinputonsessionclosed_fuzzer.h" -#include -#include -#include -#include -#include -#include -#include - #include "distributed_input_transport_base.h" namespace OHOS { diff --git a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn index 1270db61dc256e2b423e1fb4052bd8be853d7a46..de55918778c2390b34b481952d5db0849fd71ee1 100644 --- a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn @@ -24,21 +24,10 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputonsessionopend_fuzzer" include_dirs = [ - "${av_transport_path}/common/include", - "${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", - "${distributedinput_path}/inputdevicehandler/include", ] cflags = [ @@ -50,23 +39,10 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") { sources = [ "dinputonsessionopend_fuzzer.cpp" ] - deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", - "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${services_source_path}/inputinject:libdinput_inject", - "${utils_path}:libdinput_utils", - "//third_party/libevdev:libevdev", - ] + deps = + [ "${distributedinput_path}/services/transportbase:libdinput_trans_base" ] - external_deps = [ - "c_utils:utils", - "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "hitrace:hitrace_meter", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputonsessionopend_fuzzer/dinputonsessionopend_fuzzer.cpp b/test/fuzztest/dinputonsessionopend_fuzzer/dinputonsessionopend_fuzzer.cpp index 8bf43128b0dcfc07d48750a3c1e3bd6ac19c007a..5d808ec0f1921aa6d830b9a544f96d3a9fbafeef 100644 --- a/test/fuzztest/dinputonsessionopend_fuzzer/dinputonsessionopend_fuzzer.cpp +++ b/test/fuzztest/dinputonsessionopend_fuzzer/dinputonsessionopend_fuzzer.cpp @@ -15,14 +15,6 @@ #include "dinputonsessionopend_fuzzer.h" -#include -#include -#include -#include -#include -#include -#include - #include "distributed_input_transport_base.h" namespace OHOS { diff --git a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn index 03115bc4125f7d971fd789ba0533d7aa7f8014db..301b601fdecf971dfd102634710500ea82166d64 100644 --- a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn @@ -24,23 +24,8 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputreleasesink_fuzzer" include_dirs = [ - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sinkhandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -52,18 +37,9 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") { sources = [ "dinputreleasesink_fuzzer.cpp" ] - deps = [ - "${distributedinput_path}/sinkhandler:libdinput_sink_handler", - "//third_party/libevdev:libevdev", - ] + deps = [ "${distributedinput_path}/sinkhandler:libdinput_sink_handler" ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputreleasesink_fuzzer/dinputreleasesink_fuzzer.cpp b/test/fuzztest/dinputreleasesink_fuzzer/dinputreleasesink_fuzzer.cpp index 233bf56ff80733417a765cd8320fb306068bd78e..47b5b490ebbdbba57f8f49022628effb1119d093 100644 --- a/test/fuzztest/dinputreleasesink_fuzzer/dinputreleasesink_fuzzer.cpp +++ b/test/fuzztest/dinputreleasesink_fuzzer/dinputreleasesink_fuzzer.cpp @@ -15,19 +15,7 @@ #include "dinputreleasesink_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_sink_handler.h" -#include "i_distributed_sink_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn index 9399e6ca0e08b398ac188046ce08e38a27837dcc..55c2d0841ec1eed50cbb596d1a594e09e4f00a9e 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn @@ -24,25 +24,8 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputreleasesource_fuzzer" include_dirs = [ - "${av_transport_path}/common/include", - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sourcehandler/include", - "${distributedinput_path}/inputdevicehandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -54,18 +37,9 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { sources = [ "dinputreleasesource_fuzzer.cpp" ] - deps = [ - "${distributedinput_path}/sourcehandler:libdinput_source_handler", - "//third_party/libevdev:libevdev", - ] + deps = [ "${distributedinput_path}/sourcehandler:libdinput_source_handler" ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputreleasesource_fuzzer/dinputreleasesource_fuzzer.cpp b/test/fuzztest/dinputreleasesource_fuzzer/dinputreleasesource_fuzzer.cpp index c78d456d0b50dfa05c6dc9b5565d8fdb5b0a588f..ed9f7791b61b56039d02136970c398aa358b64a6 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/dinputreleasesource_fuzzer.cpp +++ b/test/fuzztest/dinputreleasesource_fuzzer/dinputreleasesource_fuzzer.cpp @@ -15,19 +15,7 @@ #include "dinputreleasesource_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_source_handler.h" -#include "i_distributed_source_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn index 94e4d97431133646d3950803457efbcc8b5f398e..f8bdbb52888050179048453ae4f5807b292db518 100644 --- a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn @@ -24,23 +24,8 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputsubscribelocaldh_fuzzer" include_dirs = [ - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sinkhandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -52,18 +37,9 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") { sources = [ "dinputsubscribelocaldh_fuzzer.cpp" ] - deps = [ - "${distributedinput_path}/sinkhandler:libdinput_sink_handler", - "//third_party/libevdev:libevdev", - ] + deps = [ "${distributedinput_path}/sinkhandler:libdinput_sink_handler" ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/dinputsubscribelocaldh_fuzzer/dinputsubscribelocaldh_fuzzer.cpp b/test/fuzztest/dinputsubscribelocaldh_fuzzer/dinputsubscribelocaldh_fuzzer.cpp index ce72b9994d9834865a9efe332a3cdc3e5e52caed..b39257ca5ffbbb70ed2af15d94deb6ab3a93cc10 100644 --- a/test/fuzztest/dinputsubscribelocaldh_fuzzer/dinputsubscribelocaldh_fuzzer.cpp +++ b/test/fuzztest/dinputsubscribelocaldh_fuzzer/dinputsubscribelocaldh_fuzzer.cpp @@ -15,19 +15,7 @@ #include "dinputsubscribelocaldh_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" #include "distributed_input_sink_handler.h" -#include "i_distributed_sink_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index 104c28dfcf19aa97f39f2ac3dac1ca32d5d6482c..d4fddfc89ad896a17aed6a565dbac76523e77208 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -25,26 +25,8 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/test/fuzztest/distributedinputclient_fuzzer" include_dirs = [ - "${av_transport_path}/common/include", - "include", - "${distributedinput_path}/interfaces/inner_kits/include", - "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", "${distributedinput_path}/sourcehandler/include", - "${distributedinput_path}/sinkhandler/include", - "${distributedinput_path}/inputdevicehandler/include", - "${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", - "${utils_path}/include", ] cflags = [ @@ -56,18 +38,9 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { sources = [ "distributed_input_client_fuzzer.cpp" ] - deps = [ - "${distributedinput_path}/sourcehandler:libdinput_source_handler", - "//third_party/libevdev:libevdev", - ] + deps = [ "${distributedinput_path}/sourcehandler:libdinput_source_handler" ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp b/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp index 737864a61bf31fe763024344d3b71d5e5a38d2d5..27223f32a9d88868d16d4c3eade5f0ec3664f01b 100644 --- a/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp +++ b/test/fuzztest/distributedinputclient_fuzzer/distributed_input_client_fuzzer.cpp @@ -15,21 +15,7 @@ #include "distributed_input_client_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" -#include "distributed_input_kit.h" -#include "distributed_input_sink_handler.h" #include "distributed_input_source_handler.h" -#include "i_distributed_sink_input.h" -#include "i_distributed_source_input.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 1a15eb03761b944c5484b9c2e4dd13fe5090cb8a..223c94cb57f9a23122669b092c1c568680caaf91 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -25,25 +25,9 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${distributedinput_path}/test/fuzztest/distributedinputkit_fuzzer" include_dirs = [ - "include", "${distributedinput_path}/interfaces/inner_kits/include", "${distributedinput_path}/interfaces/ipc/include", - "${distributedinput_path}/services/source/sourcemanager/include", - "${distributedinput_path}/services/sink/sinkmanager/include", - "${distributedinput_path}/frameworks/include", - "${distributedinput_path}/sourcehandler/include", - "${distributedinput_path}/sinkhandler/include", - "${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", - "${services_source_path}/inputinject/include", - "${distributedinput_path}/services/state/include", ] cflags = [ @@ -55,14 +39,10 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { sources = [ "distributed_input_kit_fuzzer.cpp" ] - deps = [ - "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", - "//third_party/libevdev:libevdev", - ] + deps = [ "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk" ] external_deps = [ "c_utils:utils", - "eventhandler:libeventhandler", "ipc:ipc_core", ] diff --git a/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp b/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp index 30217ec80fc56f02f5df90bee4062abc7af8ff9d..22a62e6e08b2d026c5bd81046d8eeb7af44b9072 100644 --- a/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp +++ b/test/fuzztest/distributedinputkit_fuzzer/distributed_input_kit_fuzzer.cpp @@ -15,19 +15,7 @@ #include "distributed_input_kit_fuzzer.h" -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" -#include "distributed_input_handler.h" #include "distributed_input_kit.h" -#include "distributed_input_sink_handler.h" -#include "distributed_input_source_handler.h" #include "i_distributed_sink_input.h" #include "i_distributed_source_input.h" #include "prepare_d_input_call_back_stub.h" diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 7ac18c0aa2cd17a317da85e4806c17b52d194acc..33cfaa390ab6c9992e9349d129f988461d98cf38 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -29,7 +29,6 @@ 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", @@ -51,10 +50,8 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { ] deps = [ - "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", "${utils_path}:libdinput_utils", - "//third_party/libevdev:libevdev", ] external_deps = [ @@ -62,8 +59,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "ipc:ipc_core", - "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/distributed_input_sink_transport_fuzzer.cpp b/test/fuzztest/distributedinputsinktransport_fuzzer/distributed_input_sink_transport_fuzzer.cpp index 80e5f06fe2ce4270183e26c912c1e0de4b17f388..d2571e4233124b700dc4e936aaa1ab117c41ebea 100644 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/distributed_input_sink_transport_fuzzer.cpp +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/distributed_input_sink_transport_fuzzer.cpp @@ -15,13 +15,6 @@ #include "distributed_input_sink_transport_fuzzer.h" -#include -#include -#include - -#include - -#include "constants_dinput.h" #include "distributed_input_sink_transport.h" namespace OHOS { diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index bed0ab3b1a4ac5f4d8c6c6acafcd1a0c11195d8e..646d79bbbbfeb3d54280a9898bae882b8cddcb03 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -28,17 +28,14 @@ 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", - "${distributedinput_path}/inputdevicehandler/include", "${distributedinput_path}/services/state/include", ] @@ -68,8 +65,6 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace:hitrace_meter", - "ipc:ipc_core", - "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/distributed_input_source_transport_fuzzer.cpp b/test/fuzztest/distributedinputsourcetransport_fuzzer/distributed_input_source_transport_fuzzer.cpp index 452f36c6cebfe581da4028623d8b9e67d13ebb81..d560170d18265bc63e88f9dd24e5bb321dab98e0 100644 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/distributed_input_source_transport_fuzzer.cpp +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/distributed_input_source_transport_fuzzer.cpp @@ -15,16 +15,6 @@ #include "distributed_input_source_transport_fuzzer.h" -#include -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" #include "distributed_input_inject.h" #include "distributed_input_source_transport.h" diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index fc42974057c63c1972f2274438a98f42ca764eb3..07d987a9aa1c7ef12a8d8c96893ad60720a0ba24 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -25,20 +25,15 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { include_dirs = [ "${av_transport_path}/common/include", - "${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", - "${distributedinput_path}/inputdevicehandler/include", ] cflags = [ @@ -56,7 +51,6 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${distributedinput_path}/services/transportbase:libdinput_trans_base", - "${services_source_path}/inputinject:libdinput_inject", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", ] @@ -67,8 +61,6 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hitrace:hitrace_meter", - "ipc:ipc_core", - "safwk:system_ability_fwk", ] defines = [ diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/distributed_input_transport_base_fuzzer.cpp b/test/fuzztest/distributedinputtransportbase_fuzzer/distributed_input_transport_base_fuzzer.cpp index ffeac3614a2f9a812d707c9893cb48ebcf0b9646..5f01b44aba8bee35810709921d357b5a69f7bd43 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/distributed_input_transport_base_fuzzer.cpp +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/distributed_input_transport_base_fuzzer.cpp @@ -15,16 +15,6 @@ #include "distributed_input_transport_base_fuzzer.h" -#include -#include -#include -#include -#include -#include - -#include - -#include "constants_dinput.h" #include "distributed_input_transport_base.h" namespace OHOS { diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 6981ac580dd4e077b86385404c62278884b01749..57628d0de95fd324be6667dd2384030be1839aa5 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -19,14 +19,12 @@ ohos_shared_library("libdinput_utils") { 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", "${frameworks_path}/include", ] @@ -51,7 +49,6 @@ ohos_shared_library("libdinput_utils") { "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", - "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index a64a22365c3902b2114baf85ea5f2ce95e16a27e..404bf9100383845461b005f98948c60217cfb5e3 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -30,12 +30,10 @@ 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", @@ -65,17 +63,12 @@ ohos_unittest("distributed_input_utils_test") { "COMPILE_TEST_MODE", ] - deps = [ - "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_shared", - ] + deps = [ "//third_party/openssl:libcrypto_shared" ] external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "hilog:libhilog", - "hisysevent:libhisysevent", - "ipc:ipc_core", "samgr:samgr_proxy", ]