From 4295cdbaa1df26a21749bf441305687b2e63576c Mon Sep 17 00:00:00 2001 From: litiangang4 Date: Wed, 27 Sep 2023 15:42:58 +0800 Subject: [PATCH] =?UTF-8?q?GN=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: litiangang4 --- dfx_utils/BUILD.gn | 7 ----- dfx_utils/include/hidumper.h | 3 -- dfx_utils/src/hidumper.cpp | 1 - dfx_utils/test/dfxtest/BUILD.gn | 8 ----- .../dfxtest/distributed_input_dfx_test.cpp | 3 +- .../test/dfxtest/distributed_input_dfx_test.h | 10 ------ inputdevicehandler/BUILD.gn | 6 ---- .../include/distributed_input_handler.h | 4 --- .../src/distributed_input_handler.cpp | 14 ++------- .../test/inputhandlertest/BUILD.gn | 6 ---- .../distributed_input_handler_test.cpp | 3 +- .../distributed_input_handler_test.h | 10 ------ interfaces/inner_kits/BUILD.gn | 4 --- interfaces/inner_kits/test/unittest/BUILD.gn | 6 ---- .../BUILD.gn | 10 +----- interfaces/ipc/test/clientunittest/BUILD.gn | 10 ------ .../BUILD.gn | 14 +-------- .../dinputsourcecallbackunittest/BUILD.gn | 12 +------ interfaces/ipc/test/ipcunittest/BUILD.gn | 11 +------ .../unpreparedinputcallbackunittest/BUILD.gn | 13 +------- .../unregisterdinputcallbackunittest/BUILD.gn | 13 +------- services/sink/inputcollector/BUILD.gn | 3 -- .../include/distributed_input_collector.h | 3 -- .../src/distributed_input_collector.cpp | 7 ----- .../test/sinkcollectorunittest/BUILD.gn | 4 --- services/sink/sinkmanager/BUILD.gn | 6 ++-- .../include/distributed_input_sink_manager.h | 3 +- .../src/distributed_input_sink_manager.cpp | 2 -- .../test/sinkmanagerunittest/BUILD.gn | 4 --- services/sink/transport/BUILD.gn | 2 -- .../include/distributed_input_sink_switch.h | 1 - .../distributed_input_sink_transport.h | 1 - .../src/distributed_input_sink_transport.cpp | 8 ++--- .../transport/test/sinktransunittest/BUILD.gn | 5 +-- services/source/inputinject/BUILD.gn | 7 ----- .../include/distributed_input_inject.h | 1 - .../src/distributed_input_inject.cpp | 1 - .../src/distributed_input_node_manager.cpp | 1 - .../test/sourceinjectunittest/BUILD.gn | 9 ------ .../distributed_input_sourceinject_test.cpp | 2 -- services/source/sourcemanager/BUILD.gn | 7 +---- .../test/sourcemanagerunittest/BUILD.gn | 4 --- services/source/transport/BUILD.gn | 2 -- .../test/sourcetransunittest/BUILD.gn | 3 -- services/state/BUILD.gn | 12 +------ services/state/include/dinput_state.h | 5 +-- services/state/src/dinput_state.cpp | 4 +-- services/transportbase/BUILD.gn | 6 +--- .../src/distributed_input_transport_base.cpp | 1 - .../test/transbaseunittest/BUILD.gn | 2 -- sinkhandler/BUILD.gn | 9 ------ .../include/distributed_input_sink_handler.h | 1 + sinkhandler/test/unittest/BUILD.gn | 13 +------- sourcehandler/BUILD.gn | 9 ------ .../distributed_input_source_handler.h | 4 +-- .../src/distributed_input_source_handler.cpp | 1 + sourcehandler/test/unittest/BUILD.gn | 12 ------- test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn | 24 +------------- .../dinputconfigdh_fuzzer.cpp | 12 ------- test/fuzztest/dinputinitsink_fuzzer/BUILD.gn | 23 +------------- .../dinputinitsink_fuzzer.cpp | 12 ------- .../fuzztest/dinputinitsource_fuzzer/BUILD.gn | 25 +-------------- .../dinputinitsource_fuzzer.cpp | 12 ------- .../dinputonsessionclosed_fuzzer/BUILD.gn | 29 ++--------------- .../dinputonsessionclosed_fuzzer.cpp | 8 ----- .../dinputonsessionopend_fuzzer/BUILD.gn | 30 ++---------------- .../dinputonsessionopend_fuzzer.cpp | 8 ----- .../dinputreleasesink_fuzzer/BUILD.gn | 28 ++--------------- .../dinputreleasesink_fuzzer.cpp | 12 ------- .../dinputreleasesource_fuzzer/BUILD.gn | 30 ++---------------- .../dinputreleasesource_fuzzer.cpp | 12 ------- .../dinputsubscribelocaldh_fuzzer/BUILD.gn | 28 ++--------------- .../dinputsubscribelocaldh_fuzzer.cpp | 12 ------- .../distributedinputclient_fuzzer/BUILD.gn | 31 ++----------------- .../distributed_input_client_fuzzer.cpp | 14 --------- .../distributedinputkit_fuzzer/BUILD.gn | 22 +------------ .../distributed_input_kit_fuzzer.cpp | 12 ------- .../BUILD.gn | 5 --- ...istributed_input_sink_transport_fuzzer.cpp | 7 ----- .../BUILD.gn | 5 --- ...tributed_input_source_transport_fuzzer.cpp | 10 ------ .../BUILD.gn | 8 ----- ...istributed_input_transport_base_fuzzer.cpp | 10 ------ utils/BUILD.gn | 3 -- utils/test/unittest/BUILD.gn | 9 +----- 85 files changed, 50 insertions(+), 724 deletions(-) diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index e0f85e6..0de31d9 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 c5bb91c..339a02f 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 a7febfc..4807ebf 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 feb3ce8..6d0df1d 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 f3521de..ed89fd9 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 c8c3ccc..075e494 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 53a5bc6..a584978 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 16087a8..9fbca4f 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 6c0a5f0..ffa5ace 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 be88283..7af8f10 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 979a5cd..2a64c8e 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 972e03b..6c9caa6 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 9ee637c..74068d5 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 c8ca062..8c097a0 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 1179c3c..1c212d7 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,15 +82,11 @@ 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 = [ "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 a1a38e9..2632379 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", @@ -119,7 +110,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 061bcbb..f785cd0 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 a9181fc..9387b55 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,19 +82,13 @@ 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 = [ "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 8f0d33b..fa8e75b 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,16 +92,12 @@ 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 = [ "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 b6b4b01..4225aee 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 8a54fb9..2e648b0 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 6e18351..b5b4b25 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 952b685..b03d0b6 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 3f60ca8..345ba11 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 286653c..cbf98e3 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 2a8aa04..9cb3379 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 f51a6d7..82c2f2d 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 27bd793..4844994 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 2ab18a6..a0d8204 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 240becf..ad4868e 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 f2cb6b5..88d7fd1 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 34b8162..f27829b 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 af0e0ef..654b345 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 e817dc5..7719fb0 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 0c69735..52aa23a 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 bd93c55..27cc44c 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 ea4a948..a45eb5c 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 bdde0f5..2f52b50 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 d0ad852..5de2670 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 0c929bb..024ff07 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 fc1defb..131d598 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 46761e9..1151a70 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 2c752cc..09f89a7 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 6242cfe..717d43d 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 5ca8aaf..61392c5 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 623a74e..a4d2c20 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 6c19bca..9bf4f67 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 bc4698a..4fa5a09 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 fe87f39..3e3a752 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 e537098..8875652 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 98d7120..ea72eb3 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 3a7cfdb..03d5a6a 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 3ddaec7..17b9907 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 1270db6..de55918 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 8bf4312..5d808ec 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 03115bc..301b601 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 233bf56..47b5b49 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 9399e6c..55c2d08 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 c78d456..ed9f779 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 94e4d97..f8bdbb5 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 ce72b99..b39257c 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 104c28d..d4fddfc 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 737864a..27223f3 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 1a15eb0..223c94c 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 30217ec..22a62e6 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 7ac18c0..33cfaa3 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 80e5f06..d2571e4 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 bed0ab3..646d79b 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 452f36c..d560170 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 fc42974..07d987a 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 ffeac36..5f01b44 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 6981ac5..57628d0 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 a64a223..404bf91 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", ] -- Gitee