diff --git a/BUILD.gn b/BUILD.gn index 29bf71715e4534bbebe0ea0008a90d68b5454399..b6c982bd48b98968c0aef2189d87e08c4800283b 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -125,6 +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" ] } ohos_shared_library("mbedtls_shared") { @@ -136,7 +137,6 @@ if (defined(ohos_lite)) { "platformsdk_indirect", "sasdk", ] - external_deps = [ "bounds_checking_function:libsec_static" ] part_name = "mbedtls" sources = MBEDTLS_SOURCES install_images = [ @@ -145,14 +145,6 @@ if (defined(ohos_lite)) { ] } - ohos_static_library("mbedtls_static") { - sources = MBEDTLS_SOURCES - public_configs = [ ":mbedtls_config" ] - external_deps = [ "bounds_checking_function:libsec_static" ] - part_name = "mbedtls" - subsystem_name = "thirdparty" - } - group("mbedtls") { public_deps = [ ":mbedtls_shared" ] } diff --git a/bundle.json b/bundle.json index 57eec17992bccb8f89ed1c001224f0ab43424358..6c7cbb33f4989c0f3003cfdf370098193a3d5223 100755 --- a/bundle.json +++ b/bundle.json @@ -24,12 +24,8 @@ "rom": "", "ram": "", "deps": { - "components": [ - "bounds_checking_function" - ], - "third_party": [ - "bounds_checking_function" - ] + "components": [], + "third_party": [] }, "build": { "sub_component": [], @@ -44,17 +40,6 @@ ] }, "name" : "//third_party/mbedtls:mbedtls_shared" - }, - { - "header" : { - "header_base": "//third_party/mbedtls/include", - "header_files": [ - "mbedtls/md.h", - "mbedtls/rsa.h", - "mbedtls/x509.h" - ] - }, - "name" : "//third_party/mbedtls:mbedtls_static" } ], "test": [] diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 727dd64aeba120e6ee474a4106b0bf200b038480..c324ccd2c1972845fe36218c3b8289181a2e0c23 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -1,6 +1,7 @@ /** * \file mbedtls_config.h * + * * \brief Configuration options (set of defines) * * This set of compile-time options may be used to enable diff --git a/mbedtls.gni b/mbedtls.gni index 4cd41d4bf0868d190da3b124a3b49e62c1ebdb2d..eb80c1943ff8759178b8f9935d2a3d6e54bda2bd 100644 --- a/mbedtls.gni +++ b/mbedtls.gni @@ -154,6 +154,18 @@ if (product_name == "generic_m55_arm_32_bes_aurora_wear_mini_application") { } else if (product_name == "generic_m55_arm_32_bes_phoinix_wear_mini_application") { MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_lwip" ] +} else if (product_name == + "generic_m55_arm_32_bes_jana_wear_mini_application") { + MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_lwip" ] +} else if (product_name == + "generic_m55_arm_32_bes_janapro_wear_mini_application") { + MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_lwip" ] +} else if (product_name == + "generic_m55_arm_32_bes_vili_wear_mini_application") { + MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_lwip" ] +} else if (product_name == + "generic_m55_arm_32_bes_vilipro_wear_mini_application") { + MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_lwip" ] } else { MBEDTLS_INLCUDE_DIRS += [ "$MBEDTLSDIR/port/config/compat_posix" ] -} +} \ No newline at end of file diff --git a/port/config/config_liteos_a.h b/port/config/config_liteos_a.h index 34d004ec918e1e53b97a892fef5ba549066d69b2..c249d8aef826970ec4ed6161f183d87611d8637b 100755 --- a/port/config/config_liteos_a.h +++ b/port/config/config_liteos_a.h @@ -1,6 +1,7 @@ /** * \file mbedtls_config.h * + * * \brief Configuration options (set of defines) * * This set of compile-time options may be used to enable diff --git a/port/config/config_liteos_m.h b/port/config/config_liteos_m.h index 2a905c671f5a034969d60f96d3e9fb818c0c3bbc..b3902c6d399752a7b08289d99fab8646c6477b82 100755 --- a/port/config/config_liteos_m.h +++ b/port/config/config_liteos_m.h @@ -1,6 +1,7 @@ /** * \file mbedtls_config.h * + * * \brief Configuration options (set of defines) * * This set of compile-time options may be used to enable