From 4fdb2df151f6ed14d5f008c8b0c6136032bfc7be Mon Sep 17 00:00:00 2001 From: litiangang4 Date: Wed, 14 Jun 2023 16:01:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: litiangang4 --- bundle.json | 2 +- dfx_utils/BUILD.gn | 5 +---- dfx_utils/test/dfxtest/BUILD.gn | 5 +---- inputdevicehandler/BUILD.gn | 2 +- inputdevicehandler/test/inputhandlertest/BUILD.gn | 2 +- services/sink/inputcollector/BUILD.gn | 3 +-- .../sink/inputcollector/test/sinkcollectorunittest/BUILD.gn | 2 +- services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn | 2 +- services/source/inputinject/BUILD.gn | 2 +- .../source/inputinject/test/sourceinjectunittest/BUILD.gn | 2 +- .../source/sourcemanager/test/sourcemanagerunittest/BUILD.gn | 2 +- utils/BUILD.gn | 1 - utils/test/unittest/BUILD.gn | 5 +---- 13 files changed, 12 insertions(+), 23 deletions(-) diff --git a/bundle.json b/bundle.json index 7e0d53f..0bcccbe 100755 --- a/bundle.json +++ b/bundle.json @@ -41,7 +41,7 @@ "third_party":[ "jsoncpp", "googletest", - "libcrypto_static" + "libcrypto_shared" ] }, "build":{ diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index bb20e18..76e025a 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -41,10 +41,7 @@ ohos_shared_library("libdinput_dfx_utils") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", - ] + deps = [ "${fwk_utils_path}:distributedhardwareutils" ] external_deps = [ "c_utils:utils", diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index f35b58f..ebb9f5c 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -61,10 +61,7 @@ ohos_unittest("distributed_input_dfx_test") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", - ] + deps = [ "${fwk_utils_path}:distributedhardwareutils" ] external_deps = [ "c_utils:utils", diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 16150c8..8ba69c5 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -46,7 +46,7 @@ ohos_shared_library("libdinput_handler") { "${fwk_utils_path}:distributedhardwareutils", "${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 7fd3245..7b45ea4 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("distributed_input_handler_test") { "${fwk_utils_path}:distributedhardwareutils", "${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/BUILD.gn b/services/sink/inputcollector/BUILD.gn index cc14b4b..d71f1ed 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -45,8 +45,7 @@ ohos_shared_library("libdinput_collector") { "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//third_party/libevdev:libevdev", - "//third_party/openssl:libcrypto_static", - "//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 ed77bd3..770f0d0 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -65,7 +65,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { "${fwk_utils_path}:distributedhardwareutils", "${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/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index f031feb..0b97576 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -91,7 +91,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/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index b874d45..61421aa 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -51,7 +51,7 @@ ohos_shared_library("libdinput_inject") { "${fwk_utils_path}:distributedhardwareutils", "${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/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 5b20676..8ac155a 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -78,7 +78,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/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index bf60260..c13b376 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -115,7 +115,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/utils/BUILD.gn b/utils/BUILD.gn index 7f471fe..c0ddf17 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -47,7 +47,6 @@ ohos_shared_library("libdinput_utils") { deps = [ "${fwk_interfaces_path}:libdhfwk_sdk", "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", ] external_deps = [ diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index eba48ae..b91e4f3 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -66,10 +66,7 @@ ohos_unittest("distributed_input_utils_test") { "COMPILE_TEST_MODE", ] - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", - ] + deps = [ "${fwk_utils_path}:distributedhardwareutils" ] external_deps = [ "c_utils:utils", -- Gitee