diff --git a/bundle.json b/bundle.json index 81e3d2e06f44c388e729f137407ba3e2c21b9b5a..3596472a93441a8c7f073350f7198f570c68c136 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 3ec5d33e9b412f0ff974393d5006d29236d6d865..14db2f554d466e46b276237b7df434fbff5e4783 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 154432a220545d1dd59e3b7b5d5ca4dbfc47d4cc..9d8226207c32c8c3bfb4668f70018566c1de74f4 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 5e47184a1fef257d90ee99fb1eec5faeea05241f..fef1cd9115f553e361318550283962b0e244f3a6 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 1f7097ebda8b58ef99d5b74c4a4bf223685c7ca0..907f3096b46adced28ad86aab23f2348a0e8ec24 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 1db880acb0dfb3ce716df0bf836fdf17a37c1b71..3349e1e9ad7fa65c078fc13d3a442de071e96466 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 1c30d05f39a2c9fb6cedf3b30a99dcc96bddbbf0..bfbfe7889b930bb91498889e58a6e35aca760599 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 f8a5b05fde3fca86e07ea3118a34541998f2e8c9..740bd2938e5e1f9a10c9c2799e94662076583947 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 d7efc1db4ee73ba93c4ec1006eab7df49e590eab..535807dc32006d49134807d8ffd5c720d813bafb 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 45c68bcd0f68cf3d5ae22964489290dc448580a1..1179c3ca1fd730203f0e91022f850e25b0efbb7a 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 9b16674a96d5dfa4e0e27b094d99499f36a11df5..635a24397b5d4e6e6109bb2843512ac22e2ff84e 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 8d748b0819ecc69fa530a2a495ac5a2094ad0726..061bcbb2e76eb032b2d02f5b45d3fac71ef7922f 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 b063b3be88731a428579f32e89d1d7f257ad4c67..a9181fca1ec02d36e489f705f0e4cc0f572a0b7a 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 98cec895502eaee4a63ebd689ae749f04df2cf9e..0d859538e96f74dc701c6e5681f33754b0f9950e 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 d127cb9785f40e0123d9c8f38846fb4f0c8c8931..b6b4b01c0f91ca5549bc9c52f5a1003bfb0bdbeb 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 80d707690ba9a57c70c5e04496c078e2967ea550..8a54fb9f094be7efdff6e0de070371b17b93fa6c 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 dfbadab200a6a335d912cc8b17eccbbc9535f09f..b5c5413140c147893a0efe54bfbedefea0e91658 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 3325325d9304de47f7ef11f0b4c9a828749cdaa2..d02da9fba035b6e2984b02f50fb431ffe8494650 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 2f4b1fec313881b08f7848b747f347d9357a22ec..bb291cd4b50bad0724a694aca5e61a70f26db9c9 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 a89e8473dac1afc802baffc8ee4355ee4e93a5c8..4dac2b3ad8a8bbc42a3c1da9892711f75c359233 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 7eeaa14a4460f85f68c0c7b90026393f7a4fad2f..ef0d374855624cb30fe31ebf38a936c376e180f0 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 0d525594dd8015d0002ab559538407229f64aa62..94ce8a5bfd6a7e3d1d0ac1cedd24f3a53bbc978d 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 c5b0df2ea435bf740d5e15b18e4ea32c8932f146..8d1a8a65b017d036c6b3222f0a9d15b002c03d75 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 323265df66bb9c62b43e30ef1cc3a93f05596ad1..b3511b244bee48326809abf233df73709fcb9524 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 a07d32bfca1ab3f3c9abeca924a59abe20d4f926..a0a847a1861502108ba383bde9402993bd700dd8 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 8b88b244b557546a2fde902415c1ef74a1e4138a..ee0760293f086647ab2413d77290ac8653870ff2 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 c58f5586237e8881e4486bc867a99dcdb52545dd..2b43fac88f136452a752c7518b13d28c7113e85b 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 964daa31de21a03bc33812da9d52c947e0801f35..9359c141478309f4c765bbc4de2311bf531e5ff6 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 0559dcfe80decd3e3de8ee420304924760c9f7ca..ab1c3ef507df3b786460e2120ce7d739a541c505 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 55a37813be0c5316c9f4d9eafb110d9b4ab9f1aa..3185ed47979ae8aee8c4d0822d0e64a2a3009cfa 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 f2e57d2434815cd363e36f6dab9a9aa71ca8a592..93124cd1f28c7a97d0d0a9b252bbb9b822009ce4 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 71fb58cd3ed03fc8ce12a4e247e04b137b64df93..c5321de78b261c8bcafb617a27f04c4544d67912 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 8f1ece9baa158097f8e6804e8fac0cc23d04d0ae..947579326ddbb36f23628c19f106bc009dea6823 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 1194bac3cc9c78fdbe963601c226f12597f5d88c..509dda7c10952446525b723ef119fcf7f1aeb8da 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 9defe8ecbe98a48b29ac7015027b72a02b52d55c..23e6ec3bf196afbbcca6d00b7cb5585721104b63 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 9966adedbe73b02129bf8f02aae428cf6ab9e234..1522062ccf6443285430fc03a85cbe0ef0868dcc 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 a1148cdf506ddde570a07db58413583b533dcc07..90c3c71ced591cf5680f9e8776f100fb23ec9105 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 fd97c13001d1ae946afca77aa176253a24305b8a..b68d614617720dc8d8e7954627582f962062b90d 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 825d94b01c25b97a86f7a691737f50adb1c55cd1..f0603865bc5b1ee436160c7faa840f90d73a9c77 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 5723ad6cb16647eb6750b105b94ece391499e5ef..bfb54be9bd189ea2d4a99264c7c3f287ed291b26 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 b57d4f312f2e295a7a7e83b5beddfea1475eb455..e78bf219e15dd365433e93445e2c311891d4a6c6 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 efe6eccc56366c7c31174550c57a8229bb80c792..2b56d4d892c180b711c88c918a44c830b700e1a5 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 4c862e67b10869914061dd6d8fd04b39487361b9..9e1a052dce2ae056db47e98621bb01ad19fb72a5 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 997a006e026938e334b98c491a4ac7bc4f113d54..4acb39d907e88f2e0c2569c34f614deb71ff4605 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 8921013ba18e68499bc72ed4375a0fc381c5bfa5..26599cc433494f2b6beac81b5e5d9cf9f8be46e3 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 e4c754fb2b9ab9051a076962cfa89940e4a3cec1..07339bccc8e36d54bfa9800d03d32bd464fda771 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 e37b53c1c5246a255bc53d013f06f9b4e4489490..41f73c04c6d56dca1c1446a8c2fbf72085a7bdfb 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 4077590c3d11692613a70ed0f36ee1bdcfe223c3..ae994b81b62907438563343f82a4abaded880eb9 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 = [