提交 579419cb 编写于 作者: C code4lala

Fix llvm-15 build error, compile libssl_openssl.z.so to the updater image for...

Fix llvm-15 build error, compile libssl_openssl.z.so to the updater image for wpa to use, ssl_config -> ssl_config_private
Signed-off-by: Ncode4lala <fengziteng2@huawei.com>
上级 616b235f
...@@ -42,6 +42,9 @@ openssl_internal_cflags = [ ...@@ -42,6 +42,9 @@ openssl_internal_cflags = [
"-Wno-error=implicit-fallthrough", "-Wno-error=implicit-fallthrough",
"-Wno-error=sign-compare", "-Wno-error=sign-compare",
# Fix llvm-15 build error
"-Wno-unused-but-set-variable",
] ]
crypto_config_common_private_include_dirs = [ crypto_config_common_private_include_dirs = [
...@@ -1394,7 +1397,7 @@ unused_variables += libdefault_linux_aarch64_sources ...@@ -1394,7 +1397,7 @@ unused_variables += libdefault_linux_aarch64_sources
unused_variables += libdefault_linux_x86_64_sources unused_variables += libdefault_linux_x86_64_sources
unused_variables += libdefault_mingw64_sources unused_variables += libdefault_mingw64_sources
config("ssl_config") { config("ssl_config_private") {
include_dirs = crypto_config_common_private_include_dirs + include_dirs = crypto_config_common_private_include_dirs +
crypto_config_current_platform_private_include_dirs crypto_config_current_platform_private_include_dirs
cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags +
...@@ -1459,7 +1462,7 @@ ohos_source_set("ssl_source") { ...@@ -1459,7 +1462,7 @@ ohos_source_set("ssl_source") {
"ssl/tls_srp.c", "ssl/tls_srp.c",
] ]
configs = [ ":ssl_config" ] configs = [ ":ssl_config_private" ]
public_configs = [ ":ssl_config_public" ] public_configs = [ ":ssl_config_public" ]
} }
...@@ -1489,5 +1492,10 @@ ohos_shared_library("libssl_shared") { ...@@ -1489,5 +1492,10 @@ ohos_shared_library("libssl_shared") {
":ssl_config_public", ":ssl_config_public",
] ]
install_images = [ "system" ] install_images = [
"system",
# compile libssl_openssl.z.so to the updater image for wpa to use
"updater",
]
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册