!194 独立编译补充libevdev

Merge pull request !194 from 李尚/master
This commit is contained in:
openharmony_ci
2024-05-11 08:22:59 +00:00
committed by Gitee
37 changed files with 49 additions and 71 deletions
+2 -2
View File
@@ -32,6 +32,7 @@
"hilog",
"ipc",
"json",
"libevdev",
"safwk",
"samgr",
"dsoftbus",
@@ -44,8 +45,7 @@
"graphic_surface",
"window_manager",
"openssl"
],
"third_party": [ "libevdev" ]
]
},
"build": {
"sub_component": [
+1 -1
View File
@@ -48,7 +48,6 @@ ohos_shared_library("libdinput_handler") {
deps = [
"${services_state_path}:libdinput_sink_state",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -61,6 +60,7 @@ ohos_shared_library("libdinput_handler") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
@@ -56,10 +56,7 @@ ohos_unittest("distributed_input_handler_test") {
"LOG_DOMAIN=0xD004120",
]
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
deps = [ "${utils_path}:libdinput_utils" ]
external_deps = [
"c_utils:utils",
@@ -71,6 +68,7 @@ ohos_unittest("distributed_input_handler_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+2 -4
View File
@@ -87,10 +87,7 @@ ohos_shared_library("libdinput_sdk") {
"${ipc_path}/src/unregister_d_input_call_back_stub.cpp",
]
deps = [
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
deps = [ "${utils_path}:libdinput_utils" ]
defines = [
"HI_LOG_ENABLE",
@@ -107,6 +104,7 @@ ohos_shared_library("libdinput_sdk") {
"eventhandler:libeventhandler",
"hilog:libhilog",
"ipc:ipc_core",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
+1 -1
View File
@@ -106,7 +106,6 @@ ohos_unittest("distributed_input_client_test") {
"${services_source_path}/inputinject:libdinput_inject",
"${services_source_path}/sourcemanager:libdinput_source",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -124,6 +123,7 @@ ohos_unittest("distributed_input_client_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
@@ -102,7 +102,6 @@ ohos_fuzztest("DistributedInputStubFuzzTest") {
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/transport:libdinput_source_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -120,6 +119,7 @@ ohos_fuzztest("DistributedInputStubFuzzTest") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+1 -1
View File
@@ -47,7 +47,6 @@ ohos_shared_library("libdinput_collector") {
deps = [
"${services_state_path}:libdinput_sink_state",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -60,6 +59,7 @@ ohos_shared_library("libdinput_collector") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
@@ -58,7 +58,6 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") {
deps = [
"${services_state_path}:libdinput_sink_state",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -71,6 +70,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+1 -1
View File
@@ -63,7 +63,6 @@ ohos_shared_library("libdinput_sink") {
"${services_sink_path}/inputcollector:libdinput_collector",
"${services_sink_path}/transport:libdinput_sink_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -81,6 +80,7 @@ ohos_shared_library("libdinput_sink") {
"hisysevent:libhisysevent",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
@@ -90,7 +90,6 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_sink_path}/transport:libdinput_sink_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -110,6 +109,7 @@ ohos_unittest("distributed_input_sinkmanager_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+1 -1
View File
@@ -50,7 +50,6 @@ ohos_shared_library("libdinput_sink_trans") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -66,6 +65,7 @@ ohos_shared_library("libdinput_sink_trans") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
@@ -77,7 +77,6 @@ ohos_unittest("distributed_input_sinktrans_test") {
"${services_sink_path}/inputcollector:libdinput_collector",
"${services_sink_path}/sinkmanager:libdinput_sink",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -94,6 +93,7 @@ ohos_unittest("distributed_input_sinktrans_test") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
+1 -1
View File
@@ -53,7 +53,6 @@ ohos_shared_library("libdinput_inject") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${services_state_path}:libdinput_sink_state",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -67,6 +66,7 @@ ohos_shared_library("libdinput_inject") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
@@ -74,7 +74,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${innerkits_path}:libdinput_sdk",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -85,6 +84,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+1 -1
View File
@@ -99,7 +99,6 @@ ohos_shared_library("libdinput_source") {
"${services_source_path}/inputinject:libdinput_inject",
"${services_source_path}/transport:libdinput_source_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -119,6 +118,7 @@ ohos_shared_library("libdinput_source") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
@@ -112,7 +112,6 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/transport:libdinput_source_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -130,6 +129,7 @@ ohos_unittest("distributed_input_sourcemanager_test") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"openssl:libcrypto_shared",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
+1 -1
View File
@@ -50,7 +50,6 @@ ohos_shared_library("libdinput_source_trans") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -63,6 +62,7 @@ ohos_shared_library("libdinput_source_trans") {
"hilog:libhilog",
"hitrace:hitrace_meter",
"json:nlohmann_json_static",
"libevdev:libevdev",
"samgr:samgr_proxy",
]
@@ -76,7 +76,6 @@ ohos_unittest("distributed_input_sourcetrans_test") {
"${services_source_path}/inputinject:libdinput_inject",
"${services_source_path}/sourcemanager:libdinput_source",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -87,6 +86,7 @@ ohos_unittest("distributed_input_sourcetrans_test") {
"hilog:libhilog",
"hitrace:hitrace_meter",
"json:nlohmann_json_static",
"libevdev:libevdev",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
+1 -1
View File
@@ -53,7 +53,6 @@ ohos_shared_library("libdinput_sink_state") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${services_sink_path}/transport:libdinput_sink_trans",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -65,6 +64,7 @@ ohos_shared_library("libdinput_sink_state") {
"hilog:libhilog",
"hitrace:hitrace_meter",
"ipc:ipc_core",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
@@ -46,15 +46,13 @@ ohos_unittest("dinput_sink_state_test") {
"LOG_DOMAIN=0xD004120",
]
deps = [
"${services_state_path}:libdinput_sink_state",
"//third_party/libevdev:libevdev",
]
deps = [ "${services_state_path}:libdinput_sink_state" ]
external_deps = [
"c_utils:utils",
"distributed_hardware_fwk:distributedhardwareutils",
"hilog:libhilog",
"libevdev:libevdev",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
+1 -1
View File
@@ -47,7 +47,6 @@ ohos_shared_library("libdinput_trans_base") {
deps = [
"${dfx_utils_path}:libdinput_dfx_utils",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -62,6 +61,7 @@ ohos_shared_library("libdinput_trans_base") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
@@ -74,7 +74,6 @@ ohos_unittest("distributed_input_transbase_test") {
"${innerkits_path}:libdinput_sdk",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -87,6 +86,7 @@ ohos_unittest("distributed_input_transbase_test") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
]
cflags_cc = [ "-DHILOG_ENABLE" ]
+1 -1
View File
@@ -56,7 +56,6 @@ ohos_shared_library("libdinput_source_handler") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${innerkits_path}:libdinput_sdk",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -67,6 +66,7 @@ ohos_shared_library("libdinput_source_handler") {
"hilog:libhilog",
"hisysevent:libhisysevent",
"ipc:ipc_core",
"libevdev:libevdev",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
+1 -1
View File
@@ -70,7 +70,6 @@ ohos_unittest("distributed_input_source_handler_test") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${innerkits_path}:libdinput_sdk",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -81,6 +80,7 @@ ohos_unittest("distributed_input_source_handler_test") {
"hisysevent:libhisysevent",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"samgr:samgr_proxy",
]
+2 -4
View File
@@ -51,10 +51,7 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
sources = [ "dinputconfigdh_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",
@@ -64,6 +61,7 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
+2 -4
View File
@@ -49,10 +49,7 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
sources = [ "dinputinitsink_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",
@@ -62,6 +59,7 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -51,10 +51,7 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
sources = [ "dinputinitsource_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",
@@ -64,6 +61,7 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -52,7 +52,6 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -65,6 +64,7 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -52,7 +52,6 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -65,6 +64,7 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -49,10 +49,7 @@ 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",
@@ -62,6 +59,7 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -51,10 +51,7 @@ 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",
@@ -64,6 +61,7 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -49,10 +49,7 @@ 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",
@@ -62,6 +59,7 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -53,10 +53,7 @@ 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",
@@ -66,6 +63,7 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -52,10 +52,7 @@ 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",
@@ -64,6 +61,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
]
defines = [
@@ -51,7 +51,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
"${dfx_utils_path}:libdinput_dfx_utils",
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -64,6 +63,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
"hilog:libhilog",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -56,7 +56,6 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -69,6 +68,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]
@@ -55,7 +55,6 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
"${distributedinput_path}/services/transportbase:libdinput_trans_base",
"${services_source_path}/inputinject:libdinput_inject",
"${utils_path}:libdinput_utils",
"//third_party/libevdev:libevdev",
]
external_deps = [
@@ -68,6 +67,7 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
"hitrace:hitrace_meter",
"ipc:ipc_core",
"json:nlohmann_json_static",
"libevdev:libevdev",
"safwk:system_ability_fwk",
]