openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-19 17:43:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Description:Removing Dependency Redundancy

Browse Source 
Match-id-e72a36513249b95985a4347f9304dc62f5813933
This commit is contained in:
xxxx
2022-09-09 16:06:21 +08:00
parent fb68494d3d
commit 70258d7ac3
27 changed files with 65 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/test/whitelistunittest/BUILD.gn
+2 -10
View File
@@ -44,6 +44,8 @@ ohos_unittest("distributed_input_white_list_test") {
"//third_party/json/include",
"//foundation/communication/dsoftbus/interfaces/kits/transport",
"${utils_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//base/notification/eventhandler/interfaces/inner_api",
]
sources = [
@@ -68,16 +70,6 @@ ohos_unittest("distributed_input_white_list_test") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
dfx_utils/BUILD.gn
+3 -5
View File
@@ -28,6 +28,9 @@ ohos_shared_library("libdinput_dfx_utils") {
"${frameworks_path}/include",
"${dfx_utils_path}/include",
"${service_common}/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [
@@ -43,17 +46,12 @@ ohos_shared_library("libdinput_dfx_utils") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//third_party/openssl:libcrypto_static",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
inputdevicehandler/BUILD.gn
+3 -6
View File
@@ -31,6 +31,9 @@ ohos_shared_library("libdinput_handler") {
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [
@@ -47,18 +50,12 @@ ohos_shared_library("libdinput_handler") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
interfaces/inner_kits/BUILD.gn
+3 -3
View File
@@ -34,6 +34,9 @@ config("input_sdk_public_config") {
"//third_party/json/include",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/dsoftbus/interfaces/kits/bus_center",
"//foundation/communication/dsoftbus/interfaces/kits/common",
]
}
ohos_shared_library("libdinput_sdk") {
@@ -83,7 +86,6 @@ ohos_shared_library("libdinput_sdk") {
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
defines = [
@@ -94,8 +96,6 @@ ohos_shared_library("libdinput_sdk") {
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr:samgr_proxy",
]
interfaces/inner_kits/test/unittest/BUILD.gn
+1 -6
View File
@@ -46,6 +46,7 @@ ohos_unittest("distributed_input_inner_test") {
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${frameworks_path}/include",
"//base/notification/eventhandler/interfaces/inner_api",
]
sources = [
@@ -102,17 +103,11 @@ ohos_unittest("distributed_input_inner_test") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
low_latency/BUILD.gn
+2 -11
View File
@@ -28,6 +28,8 @@ ohos_shared_library("libdinput_low_latency") {
"${frameworks_path}/include",
"${distributedinput_path}/low_latency/include",
"//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [ "src/dinput_low_latency.cpp" ]
@@ -39,21 +41,10 @@ ohos_shared_library("libdinput_low_latency") {
]
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client",
"//third_party/jsoncpp:jsoncpp",
"//third_party/openssl:libcrypto_static",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
subsystem_name = "distributedhardware"
services/sink/inputcollector/BUILD.gn
+3 -5
View File
@@ -30,6 +30,9 @@ ohos_shared_library("libdinput_collector") {
"//third_party/json/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [
@@ -48,15 +51,10 @@ ohos_shared_library("libdinput_collector") {
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/sink/sinkmanager/BUILD.gn
+8 -5
View File
@@ -41,6 +41,14 @@ ohos_shared_library("libdinput_sink") {
"${fwk_interfaces_path}/include/ipc",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/utils/include/",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
]
sources = [
@@ -63,7 +71,6 @@ ohos_shared_library("libdinput_sink") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${low_latency_path}:libdinput_low_latency",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk",
@@ -71,16 +78,12 @@ ohos_shared_library("libdinput_sink") {
"//foundation/distributedhardware/distributed_input/services/sink/transport:libdinput_sink_trans",
"${fwk_interfaces_path}:libdhfwk_sdk",
"//foundation/window/window_manager/dm:libdm",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn
+6 -4
View File
@@ -52,6 +52,12 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"${fwk_interfaces_path}/include/ipc",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/utils/include/",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
]
sources = [
@@ -94,16 +100,12 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
"//foundation/window/window_manager/dm:libdm",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/sink/transport/BUILD.gn
+3 -5
View File
@@ -33,6 +33,9 @@ ohos_shared_library("libdinput_sink_trans") {
"${low_latency_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [
@@ -58,15 +61,10 @@ ohos_shared_library("libdinput_sink_trans") {
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/sink/transport/test/sinktransunittest/BUILD.gn
+1 -5
View File
@@ -41,6 +41,7 @@ ohos_unittest("distributed_input_sinktrans_test") {
"${dfx_utils_path}/include",
"${utils_path}/include",
"${low_latency_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
]
sources = [
@@ -66,7 +67,6 @@ ohos_unittest("distributed_input_sinktrans_test") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${low_latency_path}:libdinput_low_latency",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
@@ -74,10 +74,6 @@ ohos_unittest("distributed_input_sinktrans_test") {
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/source/inputinject/BUILD.gn
+3 -8
View File
@@ -33,6 +33,9 @@ ohos_shared_library("libdinput_inject") {
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${distributedinput_path}/inputdevicehandler/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [
@@ -57,20 +60,12 @@ ohos_shared_library("libdinput_inject") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/source/inputinject/test/sourceinjectunittest/BUILD.gn
+2 -7
View File
@@ -48,6 +48,8 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${distributedinput_path}/inputdevicehandler/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//base/notification/eventhandler/interfaces/inner_api",
]
sources = [
@@ -80,19 +82,12 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/source/sourcemanager/BUILD.gn
+3 -5
View File
@@ -42,6 +42,9 @@ ohos_shared_library("libdinput_source") {
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${distributedinput_path}/inputdevicehandler/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
"//foundation/communication/dsoftbus/interfaces/kits/bus_center",
"//foundation/communication/dsoftbus/interfaces/kits/common",
]
sources = [
@@ -107,17 +110,12 @@ ohos_shared_library("libdinput_source") {
]
external_deps = [
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"eventhandler:libeventhandler",
"hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"dsoftbus:softbus_client",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn
+1 -4
View File
@@ -54,6 +54,7 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"${low_latency_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -120,18 +121,14 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
"//third_party/openssl:libcrypto_static",
"${fwk_interfaces_path}:libdhfwk_sdk",
"${innerkits_path}:libdinput_sdk",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
services/source/transport/BUILD.gn
+2 -6
View File
@@ -36,6 +36,8 @@ ohos_shared_library("libdinput_source_trans") {
"${low_latency_path}/include",
"${frameworks_path}/include",
"${distributedinput_path}/inputdevicehandler/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
]
sources = [ "src/distributed_input_source_transport.cpp" ]
@@ -57,18 +59,12 @@ ohos_shared_library("libdinput_source_trans") {
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
"//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
services/source/transport/test/sourcetransunittest/BUILD.gn
+2 -8
View File
@@ -45,6 +45,8 @@ ohos_unittest("distributed_input_sourcetrans_test") {
"${low_latency_path}/include",
"${frameworks_path}/include",
"${distributedinput_path}/inputdevicehandler/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//base/notification/eventhandler/interfaces/inner_api",
]
sources = [
@@ -69,22 +71,14 @@ ohos_unittest("distributed_input_sourcetrans_test") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${low_latency_path}:libdinput_low_latency",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
"//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
"//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
sinkhandler/BUILD.gn
+2 -6
View File
@@ -36,6 +36,8 @@ ohos_shared_library("libdinput_sink_handler") {
"${utils_path}/include",
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -53,19 +55,13 @@ ohos_shared_library("libdinput_sink_handler") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${innerkits_path}:libdinput_sdk",
"${services_sink_path}/sinkmanager:libdinput_sink",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${dfx_utils_path}:libdinput_dfx_utils",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
sinkhandler/test/unittest/BUILD.gn
+1 -6
View File
@@ -48,6 +48,7 @@ ohos_unittest("distributed_input_sink_handler_test") {
"${fwk_interfaces_path}/include/ipc",
"${services_source_path}/inputinject/include",
"${utils_path}/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -75,18 +76,12 @@ ohos_unittest("distributed_input_sink_handler_test") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/sourcemanager:libdinput_source",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
sourcehandler/BUILD.gn
+2 -7
View File
@@ -37,6 +37,8 @@ ohos_shared_library("libdinput_source_handler") {
"${fwk_interfaces_path}/include/ipc",
"${utils_path}/include",
"${services_source_path}/inputinject/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -54,20 +56,13 @@ ohos_shared_library("libdinput_source_handler") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/sourcemanager:libdinput_source",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
"${utils_path}:libdinput_utils",
"${distributedinput_path}/services/source/inputinject:libdinput_inject",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
sourcehandler/test/unittest/BUILD.gn
+1 -6
View File
@@ -48,6 +48,7 @@ ohos_unittest("distributed_input_source_handler_test") {
"${fwk_interfaces_path}/include/ipc",
"${services_source_path}/inputinject/include",
"${utils_path}/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -75,18 +76,12 @@ ohos_unittest("distributed_input_source_handler_test") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/sourcemanager:libdinput_source",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
test/fuzztest/distributedinputclient_fuzzer/BUILD.gn
+3 -16
View File
@@ -47,6 +47,9 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
"${fwk_interfaces_path}/include/ipc",
"${services_source_path}/inputinject/include",
"${utils_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//base/notification/eventhandler/interfaces/inner_api",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
]
cflags = [
@@ -59,28 +62,12 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
sources = [ "distributed_input_client_fuzzer.cpp" ]
deps = [
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
"${distributedinput_path}/interfaces/inner_kits:libdinput_sdk",
"${distributedinput_path}/services/sink/inputcollector:libdinput_collector",
"${distributedinput_path}/services/sink/sinkmanager:libdinput_sink",
"${distributedinput_path}/services/sink/transport:libdinput_sink_trans",
"${distributedinput_path}/services/source/inputinject:libdinput_inject",
"${distributedinput_path}/services/source/sourcemanager:libdinput_source",
"${distributedinput_path}/services/source/transport:libdinput_source_trans",
"${distributedinput_path}/sinkhandler:libdinput_sink_handler",
"${distributedinput_path}/sourcehandler:libdinput_source_handler",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
defines = [
test/fuzztest/distributedinputkit_fuzzer/BUILD.gn
+1 -16
View File
@@ -47,6 +47,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
"${fwk_interfaces_path}/include",
"${fwk_interfaces_path}/include/ipc",
"${services_source_path}/inputinject/include",
"//base/notification/eventhandler/interfaces/inner_api",
]
cflags = [
@@ -59,28 +60,12 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
sources = [ "distributed_input_kit_fuzzer.cpp" ]
deps = [
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
"${distributedinput_path}/interfaces/inner_kits:libdinput_sdk",
"${distributedinput_path}/services/sink/inputcollector:libdinput_collector",
"${distributedinput_path}/services/sink/sinkmanager:libdinput_sink",
"${distributedinput_path}/services/sink/transport:libdinput_sink_trans",
"${distributedinput_path}/services/source/inputinject:libdinput_inject",
"${distributedinput_path}/services/source/sourcemanager:libdinput_source",
"${distributedinput_path}/services/source/transport:libdinput_source_trans",
"${distributedinput_path}/sinkhandler:libdinput_sink_handler",
"${distributedinput_path}/sourcehandler:libdinput_source_handler",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
defines = [
test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn
+2 -5
View File
@@ -37,6 +37,8 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
"${dfx_utils_path}/include",
"${utils_path}/include",
"${low_latency_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
]
cflags = [
@@ -54,7 +56,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${low_latency_path}:libdinput_low_latency",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/communication/dsoftbus/sdk:softbus_client",
@@ -63,10 +64,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
defines = [
test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn
+2 -8
View File
@@ -43,6 +43,8 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
"${low_latency_path}/include",
"${frameworks_path}/include",
"${distributedinput_path}/inputdevicehandler/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
]
cflags = [
@@ -60,23 +62,15 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${fwk_utils_path}:distributedhardwareutils",
"${low_latency_path}:libdinput_low_latency",
"${utils_path}:libdinput_utils",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk",
"//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject",
"//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans",
"${distributedinput_path}/inputdevicehandler:libdinput_handler",
]
external_deps = [
"c_utils:utils",
"dsoftbus:softbus_client",
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
defines = [
utils/BUILD.gn
+2 -4
View File
@@ -32,6 +32,8 @@ ohos_shared_library("libdinput_utils") {
"${dfx_utils_path}/include",
"//commonlibrary/c_utils/base/include",
"${frameworks_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
]
sources = [
@@ -48,7 +50,6 @@ ohos_shared_library("libdinput_utils") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${low_latency_path}:libdinput_low_latency",
"${fwk_utils_path}:distributedhardwareutils",
"${fwk_interfaces_path}:libdhfwk_sdk",
"//third_party/openssl:libcrypto_static",
@@ -56,9 +57,6 @@ ohos_shared_library("libdinput_utils") {
external_deps = [
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"hisysevent_native:libhisysevent",
"samgr:samgr_proxy",
"c_utils:utils",
]
utils/test/unittest/BUILD.gn
+1 -10
View File
@@ -38,6 +38,7 @@ ohos_unittest("distributed_input_utils_test") {
"${fwk_interfaces_path}/include/ipc",
"//commonlibrary/c_utils/base/include",
"${frameworks_path}/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
]
sources = [ "dinput_context_test.cpp" ]
@@ -57,17 +58,7 @@ ohos_unittest("distributed_input_utils_test") {
]
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${utils_path}:libdinput_utils",
"${fwk_interfaces_path}:libdhfwk_sdk",
]
external_deps = [
"dsoftbus:softbus_client",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr:samgr_proxy",
"c_utils:utils",
]
cflags_cc = [ "-DHILOG_ENABLE" ]