From 89fbc69f81e26d125df008e4d9a3317780a93dc1 Mon Sep 17 00:00:00 2001 From: xujie223 Date: Thu, 30 Nov 2023 20:57:55 +0800 Subject: [PATCH 1/2] add openssl map Signed-off-by: xujie223 --- BUILD.gn | 2 ++ libcrypto_shared.map | 4 ++++ libssl_shared.map | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 libcrypto_shared.map create mode 100644 libssl_shared.map diff --git a/BUILD.gn b/BUILD.gn index 7f1da2aff6..f788634cf4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1590,6 +1590,7 @@ if (is_mingw || is_mac) { } ohos_shared_library("libcrypto_shared") { + version_script = "libcrypto_shared.map" sources = [] configs = [] deps = [ @@ -1733,6 +1734,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_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 96cc5236d62b230b614825f44b01a70ead374a07 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Thu, 30 Nov 2023 23:59:40 +0800 Subject: [PATCH 2/2] add openssl map Signed-off-by: liuxiyao223 --- BUILD.gn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f788634cf4..574b20349f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1590,7 +1590,9 @@ if (is_mingw || is_mac) { } ohos_shared_library("libcrypto_shared") { - version_script = "libcrypto_shared.map" + if (!is_mingw && !is_mac) { + version_script = "libcrypto_shared.map" + } sources = [] configs = [] deps = [ @@ -1734,7 +1736,9 @@ ohos_shared_library("libssl_shared") { ":openssl.cnf", ":ssl_source", ] - version_script = "libssl_shared.map" + if (!is_mingw && !is_mac) { + version_script = "libssl_shared.map" + } if (current_os == "ios") { ldflags = [ "-Wl", -- Gitee