From c13b594da7f5ffc3d58043c3e648e3b4e247579f Mon Sep 17 00:00:00 2001 From: litiangang4 Date: Thu, 15 Jun 2023 16:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: litiangang4 --- bundle.json | 2 +- common/include/test/whitelistunittest/BUILD.gn | 2 -- dfx_utils/BUILD.gn | 7 +------ dfx_utils/test/dfxtest/BUILD.gn | 8 ++------ distributedinput.gni | 2 -- inputdevicehandler/BUILD.gn | 4 +--- inputdevicehandler/test/inputhandlertest/BUILD.gn | 4 +--- interfaces/inner_kits/BUILD.gn | 2 -- interfaces/inner_kits/test/unittest/BUILD.gn | 2 -- .../ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn | 2 -- interfaces/ipc/test/clientunittest/BUILD.gn | 2 -- .../ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn | 2 -- interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn | 2 -- interfaces/ipc/test/ipcunittest/BUILD.gn | 2 -- .../ipc/test/unpreparedinputcallbackunittest/BUILD.gn | 2 -- .../ipc/test/unregisterdinputcallbackunittest/BUILD.gn | 2 -- services/sink/inputcollector/BUILD.gn | 4 +--- .../inputcollector/test/sinkcollectorunittest/BUILD.gn | 4 +--- services/sink/sinkmanager/BUILD.gn | 2 -- .../sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn | 4 +--- services/sink/transport/BUILD.gn | 3 --- services/sink/transport/test/sinktransunittest/BUILD.gn | 2 -- services/source/inputinject/BUILD.gn | 4 +--- .../source/inputinject/src/distributed_input_inject.cpp | 1 - .../source/inputinject/test/sourceinjectunittest/BUILD.gn | 4 +--- services/source/sourcemanager/BUILD.gn | 2 -- .../sourcemanager/test/sourcemanagerunittest/BUILD.gn | 4 +--- services/source/transport/BUILD.gn | 2 -- .../source/transport/test/sourcetransunittest/BUILD.gn | 3 --- services/transportbase/BUILD.gn | 2 -- services/transportbase/test/transbaseunittest/BUILD.gn | 2 -- sinkhandler/BUILD.gn | 2 -- sinkhandler/test/unittest/BUILD.gn | 2 -- sourcehandler/BUILD.gn | 2 -- sourcehandler/test/unittest/BUILD.gn | 2 -- test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn | 2 -- test/fuzztest/dinputinitsink_fuzzer/BUILD.gn | 2 -- test/fuzztest/dinputinitsource_fuzzer/BUILD.gn | 2 -- test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn | 2 -- test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn | 2 -- test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn | 2 -- test/fuzztest/distributedinputclient_fuzzer/BUILD.gn | 2 -- test/fuzztest/distributedinputkit_fuzzer/BUILD.gn | 2 -- .../distributedinputsinktransport_fuzzer/BUILD.gn | 2 -- .../distributedinputsourcetransport_fuzzer/BUILD.gn | 2 -- .../distributedinputtransportbase_fuzzer/BUILD.gn | 2 -- utils/BUILD.gn | 4 +--- utils/test/unittest/BUILD.gn | 4 +--- 48 files changed, 14 insertions(+), 114 deletions(-) diff --git a/bundle.json b/bundle.json index 81e3d2e..3596472 100755 --- a/bundle.json +++ b/bundle.json @@ -46,7 +46,7 @@ "third_party":[ "jsoncpp", "googletest", - "libcrypto_static", + "libcrypto_shared", "libevdev", "openssl" ] diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index 3ec5d33..14db2f5 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -35,8 +35,6 @@ ohos_unittest("distributed_input_white_list_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${utils_path}/include", diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 154432a..9d82262 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -21,8 +21,6 @@ ohos_shared_library("libdinput_dfx_utils") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${frameworks_path}/include", "${dfx_utils_path}/include", "${service_common}/include", @@ -41,10 +39,7 @@ ohos_shared_library("libdinput_dfx_utils") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index 5e47184..fef1cd9 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -32,8 +32,7 @@ ohos_unittest("distributed_input_dfx_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", + "${frameworks_path}/include", "${dfx_utils_path}/include", "${service_common}/include", @@ -61,10 +60,7 @@ ohos_unittest("distributed_input_dfx_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils", diff --git a/distributedinput.gni b/distributedinput.gni index 1f7097e..907f309 100644 --- a/distributedinput.gni +++ b/distributedinput.gni @@ -36,8 +36,6 @@ service_common = "${distributedinput_path}/services/common" fwk_common_path = "${distributedhardwarefwk_path}/common" -fwk_utils_path = "${distributedhardwarefwk_path}/utils" - fwk_interfaces_path = "${distributedhardwarefwk_path}/interfaces/inner_kits" distributedinput_ldflags = [ "-lpthread" ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 1db880a..3349e1e 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -21,8 +21,6 @@ ohos_shared_library("libdinput_handler") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${frameworks_path}/include", "${utils_path}/include", @@ -45,7 +43,7 @@ ohos_shared_library("libdinput_handler") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index 1c30d05..bfbfe78 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -31,8 +31,6 @@ ohos_unittest("distributed_input_handler_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${frameworks_path}/include", "${utils_path}/include", @@ -65,7 +63,7 @@ ohos_unittest("distributed_input_handler_test") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index f8a5b05..740bd29 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -23,8 +23,6 @@ config("input_sdk_public_config") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index d7efc1d..535807d 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -37,8 +37,6 @@ ohos_unittest("distributed_input_inner_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${utils_path}/include", "${fwk_interfaces_path}/include", diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index 45c68bc..1179c3c 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("add_white_list_infos_callbackl_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 9b16674..635a243 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("distributed_input_client_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index 8d748b0..061bcbb 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("del_white_list_infos_callbackl_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index b063b3b..a9181fc 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("dinput_source_callback_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 98cec89..0d85953 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("distributed_input_ipc_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index d127cb9..b6b4b01 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("unprepare_d_input_call_back_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 80d7076..8a54fb9 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn @@ -34,8 +34,6 @@ ohos_unittest("unregister_d_input_call_back_test") { "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index dfbadab..b5c5413 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -22,8 +22,6 @@ ohos_shared_library("libdinput_collector") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", @@ -44,7 +42,7 @@ ohos_shared_library("libdinput_collector") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index 3325325..d02da9f 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -33,8 +33,6 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", @@ -64,7 +62,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { deps = [ "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 2f4b1fe..bb291cd 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -26,8 +26,6 @@ ohos_shared_library("libdinput_sink") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${services_sink_path}/transport/include", "${services_sink_path}/inputcollector/include", diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index a89e847..4dac2b3 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sinkmanager_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${services_sink_path}/inputcollector/include", @@ -89,7 +87,7 @@ 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_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 7eeaa14..ef0d374 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -22,9 +22,6 @@ ohos_shared_library("libdinput_sink_trans") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${service_common}/include", "${dfx_utils_path}/include", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 0d52559..94ce8a5 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -35,8 +35,6 @@ ohos_unittest("distributed_input_sinktrans_test") { "${fwk_common_path}/utils/include", "${frameworks_path}/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${dfx_utils_path}/include", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index c5b0df2..8d1a8a6 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -22,8 +22,6 @@ ohos_shared_library("libdinput_inject") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${dfx_utils_path}/include", @@ -50,7 +48,7 @@ ohos_shared_library("libdinput_inject") { "${dfx_utils_path}:libdinput_dfx_utils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/source/inputinject/src/distributed_input_inject.cpp b/services/source/inputinject/src/distributed_input_inject.cpp index 323265d..b3511b2 100644 --- a/services/source/inputinject/src/distributed_input_inject.cpp +++ b/services/source/inputinject/src/distributed_input_inject.cpp @@ -17,7 +17,6 @@ #include -#include "dh_utils_tool.h" #include "nlohmann/json.hpp" #include "dinput_errcode.h" diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index a07d32b..a0a847a 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -36,8 +36,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${dfx_utils_path}/include", @@ -77,7 +75,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${innerkits_path}:libdinput_sdk", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 8b88b24..ee07602 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -27,8 +27,6 @@ ohos_shared_library("libdinput_source") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index c58f558..2b43fac 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${services_source_path}/inputinject/include", @@ -113,7 +111,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${innerkits_path}:libdinput_sdk", "${services_source_path}/transport:libdinput_source_trans", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 964daa3..9359c14 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -22,8 +22,6 @@ ohos_shared_library("libdinput_source_trans") { "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${service_common}/include", "${services_source_path}/inputinject/include", diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 0559dcf..ab1c3ef 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -35,9 +35,6 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "${service_common}/include", "//third_party/json/include", diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 55a3781..3185ed4 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -22,8 +22,6 @@ ohos_shared_library("libdinput_trans_base") { "${frameworks_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${service_common}/include", "${dfx_utils_path}/include", diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index f2e57d2..93124cd 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -35,8 +35,6 @@ ohos_unittest("distributed_input_transbase_test") { "${fwk_interfaces_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${dfx_utils_path}/include", diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index 71fb58c..c5321de 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -28,8 +28,6 @@ ohos_shared_library("libdinput_sink_handler") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 8f1ece9..9475793 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -39,8 +39,6 @@ ohos_unittest("distributed_input_sink_handler_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 1194bac..509dda7 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -28,8 +28,6 @@ ohos_shared_library("libdinput_source_handler") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 9defe8e..23e6ec3 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -39,8 +39,6 @@ ohos_unittest("distributed_input_source_handler_test") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${dfx_utils_path}/include", "${fwk_interfaces_path}/include", diff --git a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn index 9966ade..1522062 100644 --- a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputConfigDhFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn index a1148cd..90c3c71 100644 --- a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputInitSinkFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn index fd97c13..b68d614 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn index 825d94b..f060386 100644 --- a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn index 5723ad6..bfb54be 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn index b57d4f3..e78bf21 100644 --- a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index efe6ecc..2b56d4d 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -38,8 +38,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 4c862e6..9e1a052 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -38,8 +38,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "//third_party/json/include", "${utils_path}/include", "${fwk_interfaces_path}/include", diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 997a006..4acb39d 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -31,8 +31,6 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "//third_party/json/include", "${dfx_utils_path}/include", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index 8921013..26599cc 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index e4c754f..07339bc 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -30,8 +30,6 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", "${service_common}/include", "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index e37b53c..41f73c0 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -19,8 +19,6 @@ ohos_shared_library("libdinput_utils") { include_dirs = [ "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "//third_party/json/include", "${utils_path}/include", "${common_path}/include", @@ -44,7 +42,7 @@ ohos_shared_library("libdinput_utils") { "LOG_DOMAIN=0xD004100", ] - deps = [ "//third_party/openssl:libcrypto_static" ] + deps = [ "//third_party/openssl:libcrypto_shared" ] external_deps = [ "c_utils:utils", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 4077590..ae994b8 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -30,8 +30,6 @@ ohos_unittest("distributed_input_utils_test") { include_dirs = [ "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", - "${fwk_utils_path}/include", - "${fwk_utils_path}/include/log", "${utils_path}/include", "${utils_path}/test/unittest", "${common_path}/include", @@ -68,7 +66,7 @@ ohos_unittest("distributed_input_utils_test") { deps = [ "${utils_path}:libdinput_utils", - "//third_party/openssl:libcrypto_static", + "//third_party/openssl:libcrypto_shared", ] external_deps = [ -- Gitee