diff --git a/build/config.gni b/build/config.gni index dc544654..7ce7564b 100755 --- a/build/config.gni +++ b/build/config.gni @@ -22,9 +22,6 @@ declare_args() { # if HUKS use mbedtls engine huks_use_mbedtls = true - # mbedtls path when HUKS using mbedlts engine - huks_mbedtls_path = "//third_party/mbedtls/include" - # whether use lite storeage huks_use_lite_storage = false diff --git a/frameworks/crypto_lite/cipher/BUILD.gn b/frameworks/crypto_lite/cipher/BUILD.gn index 7e220dc7..6d75090b 100755 --- a/frameworks/crypto_lite/cipher/BUILD.gn +++ b/frameworks/crypto_lite/cipher/BUILD.gn @@ -21,13 +21,12 @@ shared_library("cipher_shared") { include_dirs = [ "include", - "//third_party/mbedtls/include/mbedtls", "//third_party/bounds_checking_function/include", ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", - "//third_party/mbedtls:mbedtls_shared", + "//third_party/mbedtls", ] cflags = [ diff --git a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn index bedf1559..cc64bf25 100755 --- a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn +++ b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn @@ -24,7 +24,6 @@ ohos_static_library("libhuks_mbedtls_standard_static") { include_dirs = [ "//utils/native/base/include", - "//third_party/mbedtls/include/", "//third_party/openssl/include/", "//third_party/openssl/crypto/ec/", ] @@ -55,7 +54,7 @@ ohos_static_library("libhuks_mbedtls_standard_static") { deps = [ "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", - "//third_party/mbedtls:mbedtls_shared", + "//third_party/mbedtls", "//third_party/openssl:libcrypto_static", ] cflags = [ diff --git a/interfaces/innerkits/huks_lite/BUILD.gn b/interfaces/innerkits/huks_lite/BUILD.gn index 21a69ec2..c454728c 100755 --- a/interfaces/innerkits/huks_lite/BUILD.gn +++ b/interfaces/innerkits/huks_lite/BUILD.gn @@ -84,10 +84,8 @@ config("hilog_lite_dir") { } config("mbedtls_engine") { - include_dirs = [ - "../../../frameworks/huks_standard/main/crypto_engine/mbedtls/include", - huks_mbedtls_path, - ] + include_dirs = + [ "../../../frameworks/huks_standard/main/crypto_engine/mbedtls/include" ] } config("soft_huks_config") { @@ -165,12 +163,7 @@ if (ohos_kernel_type == "liteos_m") { if (huks_use_mbedtls == true) { sources += huks_mbedtls_engine_sources - deps = [] - - #deps += [ "//build/lite/config/component/openssl:openssl_static" ] - if (huks_mbedtls_path == "//third_party/mbedtls/include") { - deps += [ "//third_party/mbedtls:mbedtls_static" ] - } + deps = [ "//third_party/mbedtls" ] configs += [ ":mbedtls_engine" ] }