From 9705620ad5fc36fdd5792f397b2c9cf6e50cec5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B3=BD=E5=87=A1?= Date: Mon, 30 Dec 2024 03:13:05 +0000 Subject: [PATCH 1/2] update bundle.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李泽凡 --- bundle.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bundle.json b/bundle.json index 06afa3b2..255dace3 100644 --- a/bundle.json +++ b/bundle.json @@ -19,10 +19,12 @@ "rom": "319KB", "ram": "13865KB", "deps": { - "components": [ "zlib" ], - "third_party": [ - "openssl" - ] + "components": [ + "glib", + "openssl", + "zlib" + ], + "third_party": [] }, "build": { "sub_component": [], -- Gitee From bc3bff0eac096c34f97d031d3f5171892680beb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B3=BD=E5=87=A1?= Date: Mon, 30 Dec 2024 03:13:30 +0000 Subject: [PATCH 2/2] update BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李泽凡 --- BUILD.gn | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 70eb2187..88cd30b1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -209,12 +209,6 @@ ohos_static_library("websockets") { "//third_party/libwebsockets/lib/roles/ws", "//third_party/libwebsockets/lib/roles/ws/ext", "//third_party/libwebsockets/lib/roles/raw-file", - - ################################################# - "//third_party/openssl/include/openssl", - "//third_party/openssl/crypto/evp", - "//third_party/glib/glib", - "//third_party/glib", ] if (target_os == "ios") { @@ -244,11 +238,12 @@ ohos_static_library("websockets") { "-pipe", ] - deps = [ - "//third_party/openssl:libcrypto_shared", - "//third_party/openssl:libssl_shared", + external_deps = [ + "glib:glib", + "openssl:libcrypto_shared", + "openssl:libssl_shared", + "zlib:libz", ] - external_deps = [ "zlib:libz" ] public_configs = [ ":websockets_public_config" ] } -- Gitee