From cf5213971dbc6629471e80cb1c66a25ee851ca0d Mon Sep 17 00:00:00 2001 From: hmilylmk Date: Thu, 25 Aug 2022 09:40:30 +0800 Subject: [PATCH 1/2] dsoftbus: add mbedtls module patch for adapting v3.1 * add patch files for adapting dsoftbus v3.1. Signed-off-by: hmilylmk --- .../0001-Adaptation-for-dsoftbus-v3.1.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 dsoftbus/third_party/mbedtls/0001-Adaptation-for-dsoftbus-v3.1.patch diff --git a/dsoftbus/third_party/mbedtls/0001-Adaptation-for-dsoftbus-v3.1.patch b/dsoftbus/third_party/mbedtls/0001-Adaptation-for-dsoftbus-v3.1.patch new file mode 100644 index 00000000..f1562dd0 --- /dev/null +++ b/dsoftbus/third_party/mbedtls/0001-Adaptation-for-dsoftbus-v3.1.patch @@ -0,0 +1,32 @@ +From 6d99f180cef13bc66d7286e96b480764e9aa75f9 Mon Sep 17 00:00:00 2001 +From: hmilylmk +Date: Wed, 24 Aug 2022 19:44:32 +0800 +Subject: [PATCH] Adaptation for dsoftbus v3.1 + +Signed-off-by: hmilylmk +--- + BUILD.gn | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/BUILD.gn b/BUILD.gn +index 9ecb37a..a6001c9 100755 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -198,12 +198,13 @@ if (defined(ohos_lite)) { + ohos_shared_library("mbedtls_shared") { + public_configs = [ ":mbedtls_config" ] + output_name = "mbedtls" +- subsystem_name = "common" ++ subsystem_name = "communication" + part_name = "dsoftbus_standard" + sources = mbedtls_sources + } + + group("mbedtls") { ++ public_configs = [ ":mbedtls_config" ] + deps = [ ":mbedtls_shared" ] + } + } +-- +2.34.1 + -- Gitee From 1d36740a9f517d97ff9b3210eab7de72de3b56ca Mon Sep 17 00:00:00 2001 From: hmilylmk Date: Thu, 25 Aug 2022 09:41:50 +0800 Subject: [PATCH 2/2] dsoftbus: change build target path. * adapter build target path for dsoftbus v3.1 Signed-off-by: hmilylmk --- .../0001-add-dsoftbus-build-support-for-embedded-env.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsoftbus/build/0001-add-dsoftbus-build-support-for-embedded-env.patch b/dsoftbus/build/0001-add-dsoftbus-build-support-for-embedded-env.patch index a3c59aa6..6eccb07b 100644 --- a/dsoftbus/build/0001-add-dsoftbus-build-support-for-embedded-env.patch +++ b/dsoftbus/build/0001-add-dsoftbus-build-support-for-embedded-env.patch @@ -270,8 +270,8 @@ index 38d3cc9..cde44b1 100755 deps = [ - "$root_build_dir/build_configs:parts_test", - "//test/developertest:make_temp_test", -+ "//foundation/communication/dsoftbus/core/frame/standard/server:softbus_server_main", -+ "//foundation/communication/dsoftbus/core/frame/standard/client:softbus_client", ++ "//foundation/communication/dsoftbus/core/frame:softbus_server_main", ++ "//foundation/communication/dsoftbus/sdk:softbus_client", ] } - -- Gitee