提交 4340ccf6 编写于 作者: L lnlan

fix: 修复mbedtls静态库编译报错

【背景】依赖的posix路径有变化导致编译报错

【修改方案】
1. 修改BUILD.gn中的依赖路径
【影响】
对现有的产品编译不会有影响

re #I40EMM
Signed-off-by: Nlanleinan <lanleinan@163.com>
Change-Id: I393fe40a142f078419b4fb8b404d5cb67ba9476c
上级 81bfcfb0
...@@ -110,8 +110,12 @@ lite_library("mbedtls_static") { ...@@ -110,8 +110,12 @@ lite_library("mbedtls_static") {
target_type = "static_library" target_type = "static_library"
public_configs = [ ":mbedtls_config" ] public_configs = [ ":mbedtls_config" ]
if (ohos_kernel_type == "liteos_m") { if (ohos_kernel_type == "liteos_m") {
public_deps = [ "//kernel/liteos_m/kal/posix" ] include_dirs = [
include_dirs = [ "//kernel/liteos_m/kal/posix/include", ] "//kernel/liteos_m/kal/posix/include",
"//kernel/liteos_m/kernel/include",
"//kernel/liteos_m/utils",
"//third_party/musl/porting/liteos_m/kernel/include/",
]
} }
output_name = "mbedtls" output_name = "mbedtls"
sources = mbedtls_sources sources = mbedtls_sources
...@@ -136,16 +140,13 @@ ndk_lib("mbedtls_ndk") { ...@@ -136,16 +140,13 @@ ndk_lib("mbedtls_ndk") {
} }
# for test: test profile # for test: test profile
if (ohos_build_type == "debug") { if (ohos_build_type == "debug" && ohos_kernel_type != "liteos_m") {
config("mbedtls_profile_test") { config("mbedtls_profile_test") {
include_dirs = [ include_dirs = [
"./include", "./include",
"./configs", # The directory where the custom configuration file is "./configs", # The directory where the custom configuration file is
# located # located
] ]
if (ohos_kernel_type == "liteos_m") {
include_dirs = [ "//kernel/liteos_m/kal/posix/include" ]
}
defines = [ defines = [
"MBEDTLS_CONFIG_FILE=<config_rsa_aes_cbc.h>", "MBEDTLS_CONFIG_FILE=<config_rsa_aes_cbc.h>",
"__unix__", "__unix__",
...@@ -174,8 +175,5 @@ if (ohos_build_type == "debug") { ...@@ -174,8 +175,5 @@ if (ohos_build_type == "debug") {
sources = mbedtls_sources sources = mbedtls_sources
output_name = "mbedtls_gt" output_name = "mbedtls_gt"
public_configs = [ ":mbedtls_profile_test" ] public_configs = [ ":mbedtls_profile_test" ]
if (ohos_kernel_type == "liteos_m") {
deps = [ "//kernel/liteos_m/kal/posix" ]
}
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册