diff --git a/dsoftbus/build/0002-support-hichian-for-openeuler.patch b/dsoftbus/build/0002-support-hichian-for-openeuler.patch index 8601badaaf88b3b4ffb2869612453f23d0800dc2..4c9469766c0ef791a61658fc40555ca2ab1d5e8d 100644 --- a/dsoftbus/build/0002-support-hichian-for-openeuler.patch +++ b/dsoftbus/build/0002-support-hichian-for-openeuler.patch @@ -1,12 +1,13 @@ -From 7107b08f6af32170e225922f36e315c03959c720 Mon Sep 17 00:00:00 2001 +From 4a7242c3bb1360510094ee099780e5237f8f0d53 Mon Sep 17 00:00:00 2001 From: "beiling.xie" Date: Fri, 2 Sep 2022 22:36:29 +0800 -Subject: [PATCH] support hichian for openeuler +Subject: [PATCH 2/2] support hichian for openeuler Signed-off-by: beiling.xie --- config/BUILDCONFIG.gn | 3 +++ - 1 file changed, 3 insertions(+) + core/gn/BUILD.gn | 1 + + 2 files changed, 4 insertions(+) diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn index 9e016df..4cc5b41 100755 @@ -19,6 +20,18 @@ index 9e016df..4cc5b41 100755 + +support_jsapi = false +os_level = "standard" +diff --git a/core/gn/BUILD.gn b/core/gn/BUILD.gn +index 9784cda..9c38fe4 100755 +--- a/core/gn/BUILD.gn ++++ b/core/gn/BUILD.gn +@@ -90,6 +90,7 @@ if (product_name == "ohos-sdk") { + deps = [ + "//foundation/communication/dsoftbus/core/frame:softbus_server_main", + "//foundation/communication/dsoftbus/sdk:softbus_client", ++ "//base/security/deviceauth/services:deviceauth_sdk", + ] + } + } -- 2.25.1 diff --git a/dsoftbus/build/0003-add-deviceauth-ipc-sdk-compile.patch b/dsoftbus/build/0003-add-deviceauth-ipc-sdk-compile.patch deleted file mode 100644 index 50464d8160baf0c8388dcfd696dc1dca9784df68..0000000000000000000000000000000000000000 --- a/dsoftbus/build/0003-add-deviceauth-ipc-sdk-compile.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 28c35ffaa2a84a7cebc3827ab83aec0ca39224f3 Mon Sep 17 00:00:00 2001 -From: hmilylmk -Date: Wed, 14 Sep 2022 14:38:28 +0800 -Subject: [PATCH] add deviceauth ipc sdk compile - -Signed-off-by: hmilylmk ---- - core/gn/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/core/gn/BUILD.gn b/core/gn/BUILD.gn -index 9784cda..9c38fe4 100755 ---- a/core/gn/BUILD.gn -+++ b/core/gn/BUILD.gn -@@ -90,6 +90,7 @@ if (product_name == "ohos-sdk") { - deps = [ - "//foundation/communication/dsoftbus/core/frame:softbus_server_main", - "//foundation/communication/dsoftbus/sdk:softbus_client", -+ "//base/security/deviceauth/services:deviceauth_sdk", - ] - } - } --- -2.32.0 - diff --git a/dsoftbus/build/0003-remove-build_configs-to-simplify-third-party-tools.patch b/dsoftbus/build/0003-remove-build_configs-to-simplify-third-party-tools.patch new file mode 100644 index 0000000000000000000000000000000000000000..79864b343932a0af7b05cdcc609dbaecf65a8b55 --- /dev/null +++ b/dsoftbus/build/0003-remove-build_configs-to-simplify-third-party-tools.patch @@ -0,0 +1,82 @@ +From 1fb10c696cdde31c5fe30097cc38bbc0d054c812 Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Thu, 10 Nov 2022 10:50:33 +0800 +Subject: [PATCH] remove build_configs to simplify third-party tools + +Signed-off-by: beiling.xie +--- + config/ohos/musl.gni | 2 +- + core/build_scripts/make_main.sh | 2 +- + core/gn/BUILD.gn | 12 ------------ + ohos/notice/notice.gni | 1 - + 4 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/config/ohos/musl.gni b/config/ohos/musl.gni +index f9cead9..628e93c 100644 +--- a/config/ohos/musl.gni ++++ b/config/ohos/musl.gni +@@ -17,5 +17,5 @@ if (use_musl){ + musl_sysroot = get_label_info(musl_target, "target_out_dir") + import("//third_party/musl/musl_config.gni") + } else { +- musl_sysroot = "" ++ musl_sysroot = getenv("STAGING_DIR_TARGET") + } +diff --git a/core/build_scripts/make_main.sh b/core/build_scripts/make_main.sh +index 770145c..e1168d8 100755 +--- a/core/build_scripts/make_main.sh ++++ b/core/build_scripts/make_main.sh +@@ -78,7 +78,7 @@ do_make() + if [ "${TARGET_PLATFORM}" != "" ];then + ninja_build_args="$ninja_build_args --target-platform ${TARGET_PLATFORM}" + fi +- real_build_target=$(python ${BASE_HOME}/build/scripts/build_target_handler.py $ninja_build_args) ++ real_build_target="images" + echo "build_target: "$real_build_target + + if [ "${USE_NARUTO}"x = "truex" ];then +diff --git a/core/gn/BUILD.gn b/core/gn/BUILD.gn +index 9c38fe4..0dc0260 100755 +--- a/core/gn/BUILD.gn ++++ b/core/gn/BUILD.gn +@@ -20,9 +20,6 @@ print("root_gen_dir=$root_gen_dir") + print("current_toolchain=$current_toolchain") + print("host_toolchain=$host_toolchain") + +-# load build configs and write load result to out_build_dir/build_configs +-build_loader_script = rebase_path("//build/loader/load.py") +- + _platforms_config_file = "//out/build_configs/standard_system/platforms.build" + + build_platform = "" +@@ -71,15 +68,6 @@ arguments += [ + "subsystem_examples", + ] + +-load_result = exec_script(build_loader_script, arguments, "string") +- +-if (load_result != "") { +- print() +- print(load_result) +-} +- +-print("build configs generation is complete.") +- + # gn target defined + if (product_name == "ohos-sdk") { + group("build_ohos_sdk") { +diff --git a/ohos/notice/notice.gni b/ohos/notice/notice.gni +index db49684..566aeb4 100755 +--- a/ohos/notice/notice.gni ++++ b/ohos/notice/notice.gni +@@ -14,7 +14,6 @@ + import("//build/config/python.gni") + import("//build/ohos/build_var.gni") + import("//build/ohos_var.gni") +-import("${build_configs_path}/platforms_list.gni") + + declare_args() { + sdk_notice_dir = "$root_build_dir/NOTICE_FILES/sdk" +-- +2.25.1 + diff --git a/dsoftbus/hichain/deviceauth/0003-simplify-dependency-on-third-party-packages.patch b/dsoftbus/hichain/deviceauth/0003-simplify-dependency-on-third-party-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..38e943e2c4af8b34b7698e8be51301daf0a7c19d --- /dev/null +++ b/dsoftbus/hichain/deviceauth/0003-simplify-dependency-on-third-party-packages.patch @@ -0,0 +1,79 @@ +From 382ff16702df5f06b96a76abd2b542ab00650487 Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Thu, 10 Nov 2022 14:34:05 +0800 +Subject: [PATCH] simplify dependency on third-party packages + +Signed-off-by: beiling.xie +--- + deps_adapter/BUILD.gn | 4 ++-- + services/BUILD.gn | 23 +++++++++-------------- + 2 files changed, 11 insertions(+), 16 deletions(-) + +diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn +index 906b8ca..722d974 100644 +--- a/deps_adapter/BUILD.gn ++++ b/deps_adapter/BUILD.gn +@@ -120,10 +120,10 @@ if (defined(ohos_lite)) { + "//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk", + "//depend:syspara", + "//third_party/cJSON:cjson_static", +- "//third_party/openssl:libcrypto_static", + "//utils/native/base:utils", + "//third_party/bounds_checking_function:libsec_shared", + ] +- external_deps = [ "hiviewdfx_hilog_native:libhilog" ] ++ deps += [ "//depend:libhilog" ] ++ libs = [ "crypto" ] + } + } +diff --git a/services/BUILD.gn b/services/BUILD.gn +index ce6e24b..0c37820 100644 +--- a/services/BUILD.gn ++++ b/services/BUILD.gn +@@ -167,9 +167,9 @@ if (defined(ohos_lite)) { + "//foundation/communication/dsoftbus/sdk:softbus_client" + ] + +- external_deps = [ +- "hiviewdfx_hilog_native:libhilog", +- "ipc:ipc_core", ++ deps += [ ++ "//depend:libhilog", ++ "//depend/ipc:ipc_core", + ] + if (support_jsapi) { + external_deps += [ "os_account_standard:os_account_innerkits" ] +@@ -217,12 +217,9 @@ if (defined(ohos_lite)) { + "//utils/native/base:utils", + ] + +- external_deps = [ +- "access_token:libaccesstoken_sdk", +- "hiviewdfx_hilog_native:libhilog", +- "ipc:ipc_core", +- "safwk:system_ability_fwk", +- "samgr_standard:samgr_proxy", ++ deps += [ ++ "//depend:libhilog", ++ "//depend/ipc:ipc_core", + ] + } + +@@ -268,11 +265,9 @@ if (defined(ohos_lite)) { + "//third_party/cJSON:cjson_static", + ] + +- external_deps = [ +- "access_token:libaccesstoken_sdk", +- "hiviewdfx_hilog_native:libhilog", +- "ipc:ipc_core", +- "samgr_standard:samgr_proxy", ++ deps += [ ++ "//depend:libhilog", ++ "//depend/ipc:ipc_core", + ] + } + } +-- +2.25.1 + diff --git a/dsoftbus/hichain/huks/0002-simplify-dependency-on-third-party-packages.patch b/dsoftbus/hichain/huks/0002-simplify-dependency-on-third-party-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..38753e191fab0c59a15819047162e79ea00b20e0 --- /dev/null +++ b/dsoftbus/hichain/huks/0002-simplify-dependency-on-third-party-packages.patch @@ -0,0 +1,114 @@ +From bda2efdae0c4df2c2d64796dd3469bc53f53604f Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Thu, 10 Nov 2022 14:37:25 +0800 +Subject: [PATCH] simplify dependency on third-party packages + +Signed-off-by: beiling.xie +--- + frameworks/huks_standard/main/core/BUILD.gn | 3 ++- + .../huks_standard/main/crypto_engine/openssl/BUILD.gn | 4 +++- + frameworks/huks_standard/main/os_dependency/BUILD.gn | 7 +++---- + .../huks_service/main/os_dependency/BUILD.gn | 8 +++----- + .../huks_service/main/os_dependency/idl/BUILD.gn | 2 +- + utils/crypto_adapter/BUILD.gn | 3 ++- + 6 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/frameworks/huks_standard/main/core/BUILD.gn b/frameworks/huks_standard/main/core/BUILD.gn +index b601eda..6ac01d4 100755 +--- a/frameworks/huks_standard/main/core/BUILD.gn ++++ b/frameworks/huks_standard/main/core/BUILD.gn +@@ -40,7 +40,8 @@ ohos_static_library("libhuks_core_standard_static") { + ] + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", +- "//third_party/openssl:libcrypto_static", + ] ++ ++ libs = [ "crypto" ] + complete_static_lib = true + } +diff --git a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn +index ab4d1a2..f02b701 100755 +--- a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn ++++ b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn +@@ -51,8 +51,10 @@ ohos_static_library("libhuks_openssl_standard_static") { + + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", +- "//third_party/openssl:libcrypto_static", + ] ++ ++ libs = [ "crypto" ] ++ + cflags = [ + "-DHILOG_ENABLE", + "-Wall", +diff --git a/frameworks/huks_standard/main/os_dependency/BUILD.gn b/frameworks/huks_standard/main/os_dependency/BUILD.gn +index 6da94a5..bfe2941 100755 +--- a/frameworks/huks_standard/main/os_dependency/BUILD.gn ++++ b/frameworks/huks_standard/main/os_dependency/BUILD.gn +@@ -52,10 +52,9 @@ ohos_static_library("libhuks_os_dependency_standard_static") { + "//utils/native/base:utils", + "//third_party/bounds_checking_function:libsec_shared", + ] +- external_deps = [ +- "hiviewdfx_hilog_native:libhilog", +- "ipc:ipc_core", +- "samgr_standard:samgr_proxy", ++ deps += [ ++ "//depend:libhilog", ++ "//depend/ipc:ipc_core", + ] + cflags_cc = [ + "-DHILOG_ENABLE", +diff --git a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +index 01078b7..dfa2c4f 100755 +--- a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +@@ -43,11 +43,9 @@ ohos_static_library("libhuks_service_os_dependency_standard_static") { + ] + public_deps = [ "//base/security/huks/services/huks_standard/huks_service/main/os_dependency/idl:libhuks_service_idl_standard_static" ] + +- external_deps = [ +- "hiviewdfx_hilog_native:libhilog", +- "ipc:ipc_core", +- "safwk:system_ability_fwk", +- "samgr_standard:samgr_proxy", ++ deps += [ ++ "//depend:libhilog", ++ "//depend/ipc:ipc_core", + ] + if (support_jsapi) { + sources += [ "sa/hks_event_observer.cpp" ] +diff --git a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +index 3ffcfa1..0650b2c 100755 +--- a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +@@ -43,7 +43,7 @@ ohos_static_library("libhuks_service_idl_standard_static") { + "//base/security/huks/services/huks_standard/huks_service/main/core:libhuks_service_core_standard_static", + "//utils/native/base:utils", + ] +- external_deps = [ "ipc:ipc_core" ] ++ deps += [ "//depend/ipc:ipc_core" ] + if (support_jsapi) { + external_deps += [ + "access_token:libaccesstoken_sdk", +diff --git a/utils/crypto_adapter/BUILD.gn b/utils/crypto_adapter/BUILD.gn +index 0ca8f61..7d28eea 100755 +--- a/utils/crypto_adapter/BUILD.gn ++++ b/utils/crypto_adapter/BUILD.gn +@@ -39,9 +39,10 @@ ohos_static_library("libhuks_utils_client_service_adapter_static") { + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", + "//base/security/huks/frameworks/huks_standard/main/os_dependency:libhuks_os_dependency_standard_static", +- "//third_party/openssl:libcrypto_static", + "//utils/native/base:utils", + ] + ++ libs = [ "crypto" ] ++ + complete_static_lib = true + } +-- +2.25.1 + diff --git a/dsoftbus/bounds_checking_function/0001-Adaptation-for-dsoftbus.patch b/dsoftbus/third_party/bounds_checking_function/0001-Adaptation-for-dsoftbus.patch similarity index 100% rename from dsoftbus/bounds_checking_function/0001-Adaptation-for-dsoftbus.patch rename to dsoftbus/third_party/bounds_checking_function/0001-Adaptation-for-dsoftbus.patch diff --git a/dsoftbus/third_party/cJSON/0001-adapter-cjson-in-openEuler-for-softbus.patch b/dsoftbus/third_party/cJSON/0001-adapter-cjson-in-openEuler-for-softbus.patch new file mode 100644 index 0000000000000000000000000000000000000000..fab0cd76e7938f1b50e424244323be0de3a00112 --- /dev/null +++ b/dsoftbus/third_party/cJSON/0001-adapter-cjson-in-openEuler-for-softbus.patch @@ -0,0 +1,46 @@ +From 7100861f832c43ef9b272666989f3ffd5107bc7a Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Thu, 10 Nov 2022 11:04:23 +0800 +Subject: [PATCH] adapter cjson in openEuler for softbus + +Signed-off-by: beiling.xie +--- + BUILD.gn | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + create mode 100755 BUILD.gn + +diff --git a/BUILD.gn b/BUILD.gn +new file mode 100755 +index 0000000..b15e1db +--- /dev/null ++++ b/BUILD.gn +@@ -0,0 +1,26 @@ ++#Copyright (c) 2019-2021 Huawei Device Co., Ltd. ++#Licensed under the Apache License, Version 2.0 (the "License"); ++#you may not use this file except in compliance with the License. ++#You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++#Unless required by applicable law or agreed to in writing, software ++#distributed under the License is distributed on an "AS IS" BASIS, ++#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++#See the License for the specific language governing permissions and ++#limitations under the License. ++ ++import("//build/ohos.gni") ++config("cJSON_config") { ++ include_dirs = [ "." ] ++} ++ohos_static_library("cjson_static") { ++ sources = [ "cJSON.c" ] ++ public_configs = [ ":cJSON_config" ] ++} ++ohos_shared_library("cjson") { ++ deps = [ ":cjson_static" ] ++ public_configs = [ ":cJSON_config" ] ++ subsystem_name = "hiviewdfx" ++} +-- +2.25.1 + diff --git a/dsoftbus/third_party/cJSON/third_party_cJSON-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/third_party/cJSON/third_party_cJSON-OpenHarmony-v3.1.2-Release.zip deleted file mode 100644 index 74918f80bd003ca5102fa7b3f734ca7e71359560..0000000000000000000000000000000000000000 Binary files a/dsoftbus/third_party/cJSON/third_party_cJSON-OpenHarmony-v3.1.2-Release.zip and /dev/null differ diff --git a/dsoftbus/third_party/jinja2/third_party_jinja2-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/third_party/jinja2/third_party_jinja2-OpenHarmony-v3.1.2-Release.zip deleted file mode 100644 index d094bd2bb6f6aeb91bf0cb4e0a95a9373da433e3..0000000000000000000000000000000000000000 Binary files a/dsoftbus/third_party/jinja2/third_party_jinja2-OpenHarmony-v3.1.2-Release.zip and /dev/null differ diff --git a/dsoftbus/third_party/markupsafe/third_party_markupsafe-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/third_party/markupsafe/third_party_markupsafe-OpenHarmony-v3.1.2-Release.zip deleted file mode 100644 index 81370b1f6eff951576d4a288d97f40907bbc3e76..0000000000000000000000000000000000000000 Binary files a/dsoftbus/third_party/markupsafe/third_party_markupsafe-OpenHarmony-v3.1.2-Release.zip and /dev/null differ diff --git a/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch b/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch deleted file mode 100644 index 511fc0e914b81a226735a3a062388a31cff2e3e3..0000000000000000000000000000000000000000 --- a/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 16abd091ca7f91859ae7615f679321fc5a1c863b Mon Sep 17 00:00:00 2001 -From: "beiling.xie" -Date: Fri, 2 Sep 2022 22:33:05 +0800 -Subject: [PATCH] support openssl for dsoftbus - -Signed-off-by: beiling.xie ---- - BUILD.gn | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/BUILD.gn b/BUILD.gn -index 68c53958c..8d9812046 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -31,7 +31,6 @@ config("crypto_config") { - "-pthread", - "-fPIC", - "-Wa,--noexecstack", -- "-Qunused-arguments", - "-O3", - "-DOPENSSL_USE_NODELETE", - "-DOPENSSL_PIC", --- -2.25.1 - diff --git a/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip deleted file mode 100644 index 334962af4d9203afcd6af8a66a65f6f05f83af2b..0000000000000000000000000000000000000000 Binary files a/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip and /dev/null differ diff --git a/dsoftbus/utils/0001-Adaptation-for-dsoftbus.patch b/dsoftbus/utils/0001-Adaptation-for-dsoftbus.patch index 15fd17e3d0074042e72874b9434ca6a36a4697d4..22229bf878ee32ae9a84cc46b48043bf29d931f3 100644 --- a/dsoftbus/utils/0001-Adaptation-for-dsoftbus.patch +++ b/dsoftbus/utils/0001-Adaptation-for-dsoftbus.patch @@ -1,4 +1,4 @@ -From 0ab221f7828e67d59b310df9a69ed4b4399f525d Mon Sep 17 00:00:00 2001 +From 1e7842b01138c2313b2d8d8e736f461a9690c027 Mon Sep 17 00:00:00 2001 From: "beiling.xie" Date: Wed, 21 Sep 2022 11:57:27 +0800 Subject: [PATCH] Adaptation for dsoftbus @@ -10,7 +10,7 @@ Signed-off-by: beiling.xie 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 883b1ec..ca53096 100644 +index 883b1ec..723627b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -38,24 +38,8 @@ config("static_utils_config") { @@ -58,7 +58,7 @@ index 883b1ec..ca53096 100644 - external_deps = [ "hilog_native:libhilog_base" ] - part_name = "utils_base" + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] -+ external_deps = [ "hiviewdfx_hilog_native:libhilog" ] ++ deps += [ "//depend:libhilog" ] install_images = [ "system", "updater",