diff --git a/BUILD.gn b/BUILD.gn index af83609ad0863f39c965d9f6a40f096aa2b9b7d8..c5a84917e765b7b09435e886f800c548461c15f6 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -46,7 +46,7 @@ if (defined(ohos_lite)) { config("mbedtls_config") { include_dirs = MBEDTLS_INLCUDE_DIRS - include_dirs += [ "//third_party/bounds_checking_function/include" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] if (ohos_kernel_type == "liteos_m") { defines += [ "__unix__", @@ -61,21 +61,21 @@ if (defined(ohos_lite)) { } } - lite_library("mbedtls_shared") { + ohos_shared_library("mbedtls") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } - lite_library("mbedtls_static") { + ohos_shared_library("mbedtls_static") { target_type = "static_library" public_configs = [ ":mbedtls_config" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } - group("mbedtls") { + ohos_shared_library("mbedtls") { if (ohos_kernel_type == "liteos_m") { if (ohos_security_huks_mbedtls_porting_path != "") { public_deps = [ ohos_security_huks_mbedtls_porting_path ] @@ -115,7 +115,7 @@ if (defined(ohos_lite)) { ] } - static_library("mbedtls_gt") { + ohos_shared_library("mbedtls_gt") { sources = MBEDTLS_SOURCES output_name = "mbedtls_gt" public_configs = [ ":mbedtls_profile_test" ] @@ -125,7 +125,7 @@ if (defined(ohos_lite)) { import("//build/ohos.gni") config("mbedtls_config") { include_dirs = MBEDTLS_INLCUDE_DIRS - include_dirs += [ "//third_party/bounds_checking_function/include" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } ohos_shared_library("mbedtls_shared") { @@ -144,7 +144,8 @@ if (defined(ohos_lite)) { ] } - group("mbedtls") { + ohos_shared_library("mbedtls") { public_deps = [ ":mbedtls_shared" ] } } + diff --git a/bundle.json b/bundle.json index 2728859092a7e68c674a0366a9a83258288b025e..23113a0c97e8456682a0cbfd7f2a97341398ce63 100755 --- a/bundle.json +++ b/bundle.json @@ -38,6 +38,10 @@ ] }, "name" : "//third_party/mbedtls:mbedtls_shared" + }, + { + "header" : {}, + "name" : "//third_party/mbedtls:mbedtls" } ], "test": []