From 76da1062242e44fdbd21351195834069248ce939 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Tue, 28 Nov 2023 13:53:54 +0800 Subject: [PATCH 1/2] add openssl map Signed-off-by: liuxiyao223 --- BUILD.gn | 3 +++ libcrypto_restool.map | 4 ++++ libcrypto_shared.map | 4 ++++ libssl_shared.map | 4 ++++ 4 files changed, 15 insertions(+) create mode 100644 libcrypto_restool.map create mode 100644 libcrypto_shared.map create mode 100644 libssl_shared.map diff --git a/BUILD.gn b/BUILD.gn index 7f1da2aff6..ca11be315e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1572,6 +1572,7 @@ ohos_static_library("libcrypto_static") { if (is_mingw || is_mac) { ohos_shared_library("libcrypto_restool") { + version_script = "libcrypto_restool.map" sources = [] configs = [] deps = [ ":crypto_source" ] @@ -1590,6 +1591,7 @@ if (is_mingw || is_mac) { } ohos_shared_library("libcrypto_shared") { + version_script = "libcrypto_shared.map" sources = [] configs = [] deps = [ @@ -1733,6 +1735,7 @@ ohos_shared_library("libssl_shared") { ":openssl.cnf", ":ssl_source", ] + version_script = "libssl_shared.map" if (current_os == "ios") { ldflags = [ "-Wl", diff --git a/libcrypto_restool.map b/libcrypto_restool.map new file mode 100644 index 0000000000..40554ec793 --- /dev/null +++ b/libcrypto_restool.map @@ -0,0 +1,4 @@ +openssl { + global: + *; +}; diff --git a/libcrypto_shared.map b/libcrypto_shared.map new file mode 100644 index 0000000000..40554ec793 --- /dev/null +++ b/libcrypto_shared.map @@ -0,0 +1,4 @@ +openssl { + global: + *; +}; diff --git a/libssl_shared.map b/libssl_shared.map new file mode 100644 index 0000000000..40554ec793 --- /dev/null +++ b/libssl_shared.map @@ -0,0 +1,4 @@ +openssl { + global: + *; +}; -- Gitee From 1cbf3f951464679158cf1aeeaa720c744ffa9869 Mon Sep 17 00:00:00 2001 From: xujie223 Date: Tue, 28 Nov 2023 20:15:47 +0800 Subject: [PATCH 2/2] add openssl map Signed-off-by: xujie223 --- BUILD.gn | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ca11be315e..ba7ec20909 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,6 +14,10 @@ import("//build/config/config.gni") import("//build/ohos.gni") +declare_args() { + netstack_feature_http3 = false +} + print("openssl detecting os now...") print("current_cpu = ${current_cpu}") print("current_os = ${current_os}") @@ -1572,7 +1576,9 @@ ohos_static_library("libcrypto_static") { if (is_mingw || is_mac) { ohos_shared_library("libcrypto_restool") { - version_script = "libcrypto_restool.map" + if (netstack_feature_http3) { + version_script = "libcrypto_restool.map" + } sources = [] configs = [] deps = [ ":crypto_source" ] @@ -1591,7 +1597,9 @@ if (is_mingw || is_mac) { } ohos_shared_library("libcrypto_shared") { - version_script = "libcrypto_shared.map" + if (netstack_feature_http3) { + version_script = "libcrypto_shared.map" + } sources = [] configs = [] deps = [ @@ -1735,7 +1743,9 @@ ohos_shared_library("libssl_shared") { ":openssl.cnf", ":ssl_source", ] - version_script = "libssl_shared.map" + if (netstack_feature_http3) { + version_script = "libssl_shared.map" + } if (current_os == "ios") { ldflags = [ "-Wl", -- Gitee