diff --git a/0001-feat-Adapt-to-Openeuler-python-export-lld.patch b/0001-feat-Adapt-to-Openeuler-python-export-lld.patch index eadd3b2cf593d6835edcb074ffa98100accab017..a577d34dd63d1494ef75821697d365ee8e7c1cf1 100644 --- a/0001-feat-Adapt-to-Openeuler-python-export-lld.patch +++ b/0001-feat-Adapt-to-Openeuler-python-export-lld.patch @@ -1,12 +1,7 @@ -From e7e22adf4bc5b176e68a42298e478a353e664812 Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Thu, 18 May 2023 16:10:29 +0800 -Subject: [PATCH 01/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=9B=BF?= - =?UTF-8?q?=E6=8D=A2python=E8=B7=AF=E5=BE=84=20&&=20export=20lld=E8=B7=AF?= - =?UTF-8?q?=E5=BE=84?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 9d1e0dcc61af68410c3662c64553c8235385d4d1 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0001 --- build_scripts/build.sh | 25 ++++++++++++++++++++++--- diff --git a/0002-feat-Adapt-to-Openeuler-for-compilation.patch b/0002-feat-Adapt-to-Openeuler-for-compilation.patch index 76779df03a0a2ac6965652c37c15592673367d84..37ee9ae362161ae973b2064b6f08c8755c340898 100644 --- a/0002-feat-Adapt-to-Openeuler-for-compilation.patch +++ b/0002-feat-Adapt-to-Openeuler-for-compilation.patch @@ -1,11 +1,7 @@ -From 01b899f9d73acccd7c44d1c2e049ad63a0a312d6 Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Thu, 18 May 2023 16:11:43 +0800 -Subject: [PATCH 02/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E7=BC=96?= - =?UTF-8?q?=E8=AF=91=E7=9B=B8=E5=85=B3?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 15ecabfa18a391b57ee46ed94b3b0aa74e00b5af Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0002 --- config/BUILDCONFIG.gn | 45 ++++- diff --git a/0003-feat-Adapt-to-Openeuler-add-clang.patch b/0003-feat-Adapt-to-Openeuler-add-clang.patch index 0efb8f4600c16dd963676d2a64f3446527cfd720..f70d1d39e34636c33d4fa4c702df6fba908e243e 100644 --- a/0003-feat-Adapt-to-Openeuler-add-clang.patch +++ b/0003-feat-Adapt-to-Openeuler-add-clang.patch @@ -1,12 +1,7 @@ -From 8cfe4ff5d9910524223706b37dacdea1ff2e2aea Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Thu, 18 May 2023 16:12:08 +0800 -Subject: [PATCH 03/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=96=B0?= - =?UTF-8?q?=E5=A2=9E=E5=B9=B3=E5=8F=B0=E7=BC=96=E8=AF=91=E9=93=BE=20&&=20?= - =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 6e60ac76bd9c5502b7ce23cb7c566075f1e22dce Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0003 --- toolchain/gcc_toolchain.gni | 7 ++++++- diff --git a/0004-feat-Adapt-to-Openeuler-add-include-file.patch b/0004-feat-Adapt-to-Openeuler-add-include-file.patch index 8d74d9ef7f1c68c93f8be3f7a088d36cc6797671..229cb60b84af4078e73898accdee87577bee693e 100644 --- a/0004-feat-Adapt-to-Openeuler-add-include-file.patch +++ b/0004-feat-Adapt-to-Openeuler-add-include-file.patch @@ -1,12 +1,7 @@ -From dd39926f233ced1acad598f0fe8baef591f839f6 Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Thu, 18 May 2023 16:12:28 +0800 -Subject: [PATCH 04/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=96=B0?= - =?UTF-8?q?=E5=A2=9E=E7=9B=AE=E5=BD=95=E7=94=A8=E4=BA=8E=E5=B9=B3=E5=8F=B0?= - =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=80=A7?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 855454a4fdde2256be75ad6703fddde0fa7c5e8b Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0004 --- openeuler/BUILD.gn | 13 ++++++ diff --git a/0005-feat-use-pyyaml-on-openeuler.patch b/0005-feat-use-pyyaml-on-openeuler.patch index bf959447a4b715ff7e8371f7ac421d9e2dbac2c3..4d63a59e08d37ae4c110d9d3bf51dc53cb112c0f 100644 --- a/0005-feat-use-pyyaml-on-openeuler.patch +++ b/0005-feat-use-pyyaml-on-openeuler.patch @@ -1,7 +1,7 @@ -From 76fa62cebb91efc4e41e50b024fc226d4ae34c1d Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Thu, 18 May 2023 08:43:41 +0000 -Subject: [PATCH 05/11] feat:use pyyaml on openeuler +From 42b71076304a0efb17fa7dfcc3286c727be35a73 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0005 --- ohos/hisysevent/gen_def_from_all_yaml.py | 2 +- diff --git a/0006-feat-add-base-config.json-for-openeuler.patch b/0006-feat-add-base-config.json-for-openeuler.patch index 8bffc8fdf15191d7891e48ec8df6fce5350e170f..318ea4baed11eecb1b429c08eac5f680adaebb35 100644 --- a/0006-feat-add-base-config.json-for-openeuler.patch +++ b/0006-feat-add-base-config.json-for-openeuler.patch @@ -1,7 +1,7 @@ -From d4188c449e08fe30a7859fa23378b1f25c2f69cb Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Thu, 18 May 2023 09:36:07 +0000 -Subject: [PATCH 06/11] feat:add base config.json for openeuler +From aea0f5f7f298a45b287151e1d53d26cdd6db1268 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0006 --- .../vendor/openeuler/openeuler/config.json | 108 ++++++++++++++++++ diff --git a/0007-feat-add-gn-files-to-use-packages-on-openeuler.patch b/0007-feat-add-gn-files-to-use-packages-on-openeuler.patch index 4818410cb6037b6fb81dde002e05483808c33b37..cb7e95d7a2adf094839242db98f6cec14f67e1c1 100644 --- a/0007-feat-add-gn-files-to-use-packages-on-openeuler.patch +++ b/0007-feat-add-gn-files-to-use-packages-on-openeuler.patch @@ -1,240 +1,23 @@ -From a2c22a0926e430d4021422fd43da59a95abeba67 Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Thu, 18 May 2023 09:36:59 +0000 -Subject: [PATCH 07/11] feat: add gn files to use packages on openeuler +From b6fa9cb06682311714ce18e6a65f243c6299af2f Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0007 --- - .../systemabilitymgr/samgr/bundle.json | 78 +++++++++++++++++++ - .../interfaces/innerkits/common/BUILD.gn | 38 +++++++++ - .../samgr/interfaces/innerkits/common/include | 1 + - .../interfaces/innerkits/samgr_proxy/BUILD.gn | 43 ++++++++++ - .../interfaces/innerkits/samgr_proxy/include | 1 + - .../samgr/services/lsamgr/include | 1 + - .../bounds_checking_function/BUILD.gn | 28 +++++++ + .../bounds_checking_function/BUILD.gn | 28 +++++++++++++++++++ .../bounds_checking_function/include | 1 + - .../compiler_gn/third_party/cJSON/BUILD.gn | 25 ++++++ + .../compiler_gn/third_party/cJSON/BUILD.gn | 25 +++++++++++++++++ .../compiler_gn/third_party/cJSON/cJSON.h | 1 + - .../compiler_gn/third_party/libxml2/BUILD.gn | 11 +++ + .../compiler_gn/third_party/libxml2/BUILD.gn | 11 ++++++++ .../third_party/libxml2/include/libxml | 1 + - .../compiler_gn/third_party/mbedtls/BUILD.gn | 19 +++++ - .../compiler_gn/third_party/mbedtls/include | 1 + - 14 files changed, 249 insertions(+) - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn - create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn - create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include - create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include + 6 files changed, 67 insertions(+) create mode 100644 openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn create mode 120000 openeuler/compiler_gn/third_party/bounds_checking_function/include create mode 100644 openeuler/compiler_gn/third_party/cJSON/BUILD.gn create mode 120000 openeuler/compiler_gn/third_party/cJSON/cJSON.h create mode 100644 openeuler/compiler_gn/third_party/libxml2/BUILD.gn create mode 120000 openeuler/compiler_gn/third_party/libxml2/include/libxml - create mode 100644 openeuler/compiler_gn/third_party/mbedtls/BUILD.gn - create mode 120000 openeuler/compiler_gn/third_party/mbedtls/include -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json -new file mode 100644 -index 0000000..25dc757 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/bundle.json -@@ -0,0 +1,78 @@ -+{ -+ "name": "@ohos/systemabilitymgr_samgr", -+ "description": "system ability manager", -+ "homePage": "https://gitee.com/openharmony", -+ "version": "3.1", -+ "license": "Apache License 2.0", -+ "repository": "https://gitee.com/openharmony/systemabilitymgr_samgr", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "foundation/systemabilitymgr/samgr" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "component": { -+ "name": "samgr", -+ "subsystem": "systemabilitymgr", -+ "features": [ "samgr_feature_coverage = false" ], -+ "adapted_system_type": [ -+ "standard" -+ ], -+ "rom": "300KB", -+ "ram": "7130KB", -+ "deps": { -+ "components": [ -+ "access_token", -+ "c_utils", -+ "eventhandler", -+ "hisysevent_native", -+ "hitrace_native", -+ "hiviewdfx_hilog_native", -+ "init", -+ "ipc", -+ "samgr", -+ "selinux", -+ "startup_l2" -+ ], -+ "third_party": [ "libxml2" ] -+ }, -+ "build": { -+ "group_type": { -+ "base_group": [], -+ "fwk_group": [ -+ "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common", -+ "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" -+ ] -+ }, -+ "inner_kits": [ -+ { -+ "header": { -+ "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", -+ "header_files": [ -+ "if_system_ability_manager.h", -+ "iservice_registry.h", -+ "isystem_ability_load_callback.h", -+ "isystem_ability_status_change.h", -+ "system_ability_definition.h", -+ "system_ability_manager_proxy.h", -+ "system_ability_load_callback_stub.h", -+ "system_ability_status_change_stub.h", -+ "sam_log.h" -+ ] -+ }, -+ "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" -+ }, -+ { -+ "header": { -+ "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include/", -+ "header_files": [ -+ "sa_profiles.h", -+ "parse_util.h" -+ ] -+ }, -+ "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common" -+ } -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -new file mode 100644 -index 0000000..a129d8b ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -@@ -0,0 +1,38 @@ -+# Copyright (c) 2022 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("all_config_samgr_common") { -+ include_dirs = [ -+ "include", -+ ] -+ libs = ["samgr_common",] -+} -+ -+config("config_samgr_common") { -+ include_dirs = [ -+ "include", -+ ] -+ libs = ["samgr_common",] -+} -+ -+################################################################################ -+group("samgr_common") { -+ -+ public_configs = [ ":config_samgr_common" ] -+ -+ all_dependent_configs = [ ":all_config_samgr_common" ] -+ -+} -+################################################################################ -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include -new file mode 120000 -index 0000000..bc414ef ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include -@@ -0,0 +1 @@ -+/usr/include/ -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn -new file mode 100644 -index 0000000..44b42ad ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn -@@ -0,0 +1,43 @@ -+# Copyright (c) 2021-2022 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") -+import("//build/ohos_var.gni") -+ -+config("samgr_proxy_config") { -+ include_dirs = [ -+ "include", -+ "//third_party/libxml2/include", -+ ] -+ -+ libs = ["samgr_proxy",] -+} -+ -+#config("samgr_proxy_private_config") { -+# include_dirs = [ -+# "include", -+ #"//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr", -+ #"//foundation/systemabilitymgr/samgr/services/lsamgr/include", -+ #"//foundation/systemabilitymgr/samgr/services/samgr/native/include", -+ #"//foundation/systemabilitymgr/samgr/utils/native/include", -+# ] -+# libs = ["samgr_proxy",] -+#} -+ -+group("samgr_proxy"){ -+#ohos_shared_library("samgr_proxy") { -+ public_configs = [ ":samgr_proxy_config" ] -+ -+ all_dependent_configs = [ ":samgr_proxy_config" ] -+ -+} -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include -new file mode 120000 -index 0000000..bc414ef ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include -@@ -0,0 +1 @@ -+/usr/include/ -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include -new file mode 120000 -index 0000000..bc414ef ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include -@@ -0,0 +1 @@ -+/usr/include/ -\ No newline at end of file diff --git a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn new file mode 100644 index 0000000..ae44b79 @@ -341,39 +124,6 @@ index 0000000..8eb8d2d @@ -0,0 +1 @@ +/usr/include/libxml2/libxml/ \ No newline at end of file -diff --git a/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn b/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn -new file mode 100644 -index 0000000..dd5723b ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/mbedtls/BUILD.gn -@@ -0,0 +1,19 @@ -+import("//build/ohos.gni") -+config("mbedtls_config") { -+ include_dirs = [ -+ "include", -+ ] -+ libs = [ -+ "mbedtls", -+ "mbedcrypto", -+ ] -+} -+ -+ohos_shared_library("mbedtls_shared") { -+ public_configs = [ ":mbedtls_config" ] -+} -+ -+group("mbedtls") { -+ public_deps = [ ":mbedtls_shared" ] -+} -+ -diff --git a/openeuler/compiler_gn/third_party/mbedtls/include b/openeuler/compiler_gn/third_party/mbedtls/include -new file mode 120000 -index 0000000..bc414ef ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/mbedtls/include -@@ -0,0 +1 @@ -+/usr/include/ -\ No newline at end of file -- 2.33.0 diff --git a/0008-feat-Adapt-to-openeuler.patch b/0008-feat-Adapt-to-openeuler.patch index 6561c495b3ecfd6693807236ff17bb4927f79275..898f451dca7ee6aa3209d9e0fcce0c316a561260 100644 --- a/0008-feat-Adapt-to-openeuler.patch +++ b/0008-feat-Adapt-to-openeuler.patch @@ -1,7 +1,7 @@ -From ab7d96e80f3828a05b8fd8ea923d38b3d67500f4 Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Fri, 19 May 2023 17:17:15 +0800 -Subject: [PATCH 08/11] feat : Adapt to openeuler +From 36899a1bd498e730983259e8330a006eb09ff702 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0008 --- build_scripts/build.sh | 27 +-- diff --git a/0009-feat-add-common-subsystem-and-delete-useless-config.patch b/0009-feat-add-common-subsystem-and-delete-useless-config.patch index 8faa23cee6e7dba661e09a9052dc3988797c4949..671a2a7841fe72ccddfd63546ec3a8693826090a 100644 --- a/0009-feat-add-common-subsystem-and-delete-useless-config.patch +++ b/0009-feat-add-common-subsystem-and-delete-useless-config.patch @@ -1,7 +1,7 @@ -From 43f6c457bbbdd2cc158f49e6653ffa028661daf2 Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Fri, 19 May 2023 09:29:22 +0000 -Subject: [PATCH 09/11] feat:add common subsystem and delete useless config +From 617f6a50de2e620d087aeacae0c1b228796cb9ba Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:52 +0800 +Subject: [PATCH] 0009 --- openeuler/vendor/openeuler/openeuler/config.json | 9 ++++++++- diff --git a/0010-feat-use-include-samgr-for-samgr-include-files-confi.patch b/0010-feat-use-include-samgr-for-samgr-include-files-confi.patch deleted file mode 100644 index 9648db2c89a2e82c09530ba44ca5a60985a319ac..0000000000000000000000000000000000000000 --- a/0010-feat-use-include-samgr-for-samgr-include-files-confi.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7526b048d75a773274144236209eea422e2307c5 Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Fri, 19 May 2023 09:34:27 +0000 -Subject: [PATCH 10/11] feat:use include/samgr for samgr include files config - ---- - .../systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn | 2 -- - .../systemabilitymgr/samgr/interfaces/innerkits/common/include | 2 +- - .../samgr/interfaces/innerkits/samgr_proxy/include | 2 +- - .../foundation/systemabilitymgr/samgr/services/lsamgr/include | 2 +- - 4 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -index a129d8b..bf8ddb3 100644 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -@@ -27,7 +27,6 @@ config("config_samgr_common") { - libs = ["samgr_common",] - } - --################################################################################ - group("samgr_common") { - - public_configs = [ ":config_samgr_common" ] -@@ -35,4 +34,3 @@ group("samgr_common") { - all_dependent_configs = [ ":all_config_samgr_common" ] - - } --################################################################################ -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include -index bc414ef..fa4da59 120000 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include -@@ -1 +1 @@ --/usr/include/ -\ No newline at end of file -+/usr/include/samgr/ -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include -index bc414ef..fa4da59 120000 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include -@@ -1 +1 @@ --/usr/include/ -\ No newline at end of file -+/usr/include/samgr/ -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include -index bc414ef..fa4da59 120000 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/services/lsamgr/include -@@ -1 +1 @@ --/usr/include/ -\ No newline at end of file -+/usr/include/samgr/ -\ No newline at end of file --- -2.33.0 - diff --git a/0011-feat-use-.z-for-libs-name.patch b/0011-feat-use-.z-for-libs-name.patch deleted file mode 100644 index c2c1a8569561c78f785eafd4fb4281ac2d73884a..0000000000000000000000000000000000000000 --- a/0011-feat-use-.z-for-libs-name.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9801c82c2e5f8f2fd20115c3af413d912d305e4b Mon Sep 17 00:00:00 2001 -From: tian hang -Date: Fri, 19 May 2023 09:37:15 +0000 -Subject: [PATCH 11/11] feat:use .z for libs name - ---- - .../samgr/interfaces/innerkits/common/BUILD.gn | 4 ++-- - .../samgr/interfaces/innerkits/samgr_proxy/BUILD.gn | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -index bf8ddb3..4b46680 100644 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/common/BUILD.gn -@@ -17,14 +17,14 @@ config("all_config_samgr_common") { - include_dirs = [ - "include", - ] -- libs = ["samgr_common",] -+ libs = ["samgr_common.z",] - } - - config("config_samgr_common") { - include_dirs = [ - "include", - ] -- libs = ["samgr_common",] -+ libs = ["samgr_common.z",] - } - - group("samgr_common") { -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn -index 44b42ad..b68ec17 100644 ---- a/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/BUILD.gn -@@ -20,7 +20,7 @@ config("samgr_proxy_config") { - "//third_party/libxml2/include", - ] - -- libs = ["samgr_proxy",] -+ libs = ["samgr_proxy.z",] - } - - #config("samgr_proxy_private_config") { --- -2.33.0 - diff --git a/0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch b/0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch index 63e9fad63a86affa92324a8fc161181fe679dfff..d8610fd5a375a2fc726cf002c7fd108157a7098e 100644 --- a/0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch +++ b/0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch @@ -1,7 +1,7 @@ -From c42d7cc5c56f11131dd6debee3b383b49d2d4344 Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Tue, 30 May 2023 16:50:10 +0800 -Subject: [PATCH] fix rpm build fail caused by wrong useless code +From 1cbc7b95aae9da56ed4fa257d7132ac03c378601 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0012 --- config/mac/xcrun.py | 2 +- diff --git a/0013-feature-use-llvm-tools-version-15-for-build.patch b/0013-feature-use-llvm-tools-version-15-for-build.patch index 5b1fd0a9edfb299f3feb0e06bb24d0186ee79213..a69e6066c9fbe1563e7e4f2b056506887fddbebd 100644 --- a/0013-feature-use-llvm-tools-version-15-for-build.patch +++ b/0013-feature-use-llvm-tools-version-15-for-build.patch @@ -1,7 +1,7 @@ -From f368525248e0bd5f4b101bfa7b4bff98a0eb45af Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Tue, 13 Jun 2023 16:33:47 +0800 -Subject: [PATCH] feature:use llvm tools version 15 for build +From cf30b6c5ecd1dc864bf25c3eea3c3b420797d6f3 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0013 --- build_scripts/build.sh | 3 +-- @@ -71,7 +71,7 @@ index b7e1c45..e5d4d54 100644 } - libclang_rt_file = "${clang_base_path}/lib/clang/12.0.1/lib/${abi_target}/libclang_rt.builtins.a" -+ libclang_rt_file = "${clang_base_path}/lib/clang/15.0.7/lib/${abi_target}/libclang_rt.builtins.a" ++ libclang_rt_file = "${clang_base_path}/lib/clang/17.0.6/lib/${abi_target}/libclang_rt.builtins.a" } diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni index 0c91ccf..6a68e42 100755 @@ -95,7 +95,7 @@ index 1e95b63..7794e6f 100755 if (is_clang) { # Clang compiler version. Clang files are placed at version-dependent paths. - clang_version = "12.0.1" -+ clang_version = "15.0.7" ++ clang_version = "17.0.6" } use_custom_clang = true } diff --git a/0014-feat-delete-the-default-sqlite-deps.patch b/0014-feat-delete-the-default-sqlite-deps.patch index bf0bbb5f867002173cbbecced88db8ab59feae27..9486e4b9201c2502e0c344e26414bab8560e830c 100644 --- a/0014-feat-delete-the-default-sqlite-deps.patch +++ b/0014-feat-delete-the-default-sqlite-deps.patch @@ -1,7 +1,7 @@ -From 2e2faeec378bf28912d3339afc24f1955f81fe02 Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Thu, 15 Jun 2023 11:12:35 +0800 -Subject: [PATCH 1/2] feat delete the default sqlite deps +From 62f7f666dba56a23d31d53a480f5957dc6e1f05d Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0014 --- common/BUILD.gn | 3 ++- diff --git a/0015-feat-and-hilog-gn-files.patch b/0015-feat-and-hilog-gn-files.patch index c3e5840dbaa497962768d4687996745a58a34b3f..702de9b2f7c1074460699a9a65972a5ff805d061 100644 --- a/0015-feat-and-hilog-gn-files.patch +++ b/0015-feat-and-hilog-gn-files.patch @@ -1,7 +1,7 @@ -From 1e4e43b6c5fc612c314e99914251235a37d839cb Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Thu, 15 Jun 2023 14:15:23 +0800 -Subject: [PATCH 2/2] feat:and hilog gn files +From 9c2b1b9b9d9170775358732a04ff65bb65ed6c55 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0015 --- .../base/hiviewdfx/hilog/bundle.json | 37 ++++++++++ diff --git a/0016-fix-use-llvm15-path-on-x86_64.patch b/0016-fix-use-llvm15-path-on-x86_64.patch index 2b2d7c49686961b1992a755d618f049c81287463..69cba52318cccdbe594e6e52a909149fb5c62294 100644 --- a/0016-fix-use-llvm15-path-on-x86_64.patch +++ b/0016-fix-use-llvm15-path-on-x86_64.patch @@ -1,7 +1,7 @@ -From 0b07bcf8a6550a98c5b87b9da2bc9ac41af1bf4e Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Thu, 15 Jun 2023 17:16:03 +0800 -Subject: [PATCH] fix: use llvm15 path on x86_64 +From bc15bf76bd51a0c017b8f1a289e84831ac7a6388 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0016 --- toolchain/linux/BUILD.gn | 1 - diff --git a/0017-feat-add-script-to-create-soft-link.patch b/0017-feat-add-script-to-create-soft-link.patch index aadbb4713d829627ddb311d2d46e5e0d5d040d43..b8ccd3ddef012fcd736859d262bacb8b5aef3016 100644 --- a/0017-feat-add-script-to-create-soft-link.patch +++ b/0017-feat-add-script-to-create-soft-link.patch @@ -1,7 +1,7 @@ -From 2e6f009669ad3f5a7c5ab3d0f50ff612881820d5 Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Fri, 16 Jun 2023 10:10:39 +0800 -Subject: [PATCH 2/3] feat:add script to create soft link +From 0d541aba54454543bcfc9f9047f87d1570413b1b Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Thu, 9 Nov 2023 11:10:53 +0800 +Subject: [PATCH] 0017 --- openeuler/script/link.py | 46 ++++++++++++++++++++++++++++++++++++++++ diff --git a/0018-feat-add-safwk-compile-gn-target.patch b/0018-feat-add-safwk-compile-gn-target.patch deleted file mode 100644 index c0a1bbe6e20a7434f04d0ea273e7d8d2a3072544..0000000000000000000000000000000000000000 --- a/0018-feat-add-safwk-compile-gn-target.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 7aa47681e17926be40f9ef7074377816fdc76efe Mon Sep 17 00:00:00 2001 -From: peng_langyuan -Date: Fri, 16 Jun 2023 10:09:08 +0800 -Subject: [PATCH 1/3] feat:add safwk compile gn target - ---- - .../systemabilitymgr/safwk/bundle.json | 58 +++++++++++++++++++ - .../safwk/interfaces/innerkits/safwk/BUILD.gn | 41 +++++++++++++ - .../safwk/services/safwk/BUILD.gn | 22 +++++++ - 3 files changed, 121 insertions(+) - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/safwk/bundle.json - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/systemabilitymgr/safwk/services/safwk/BUILD.gn - -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/bundle.json b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/bundle.json -new file mode 100644 -index 0000000..1964532 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/bundle.json -@@ -0,0 +1,58 @@ -+{ -+ "name": "@ohos/systemabilitymgr_safwk", -+ "description": "system ability framework", -+ "homePage": "https://gitee.com/openharmony", -+ "version": "3.1", -+ "license": "Apache License 2.0", -+ "repository": "https://gitee.com/openharmony/systemabilitymgr_safwk", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "foundation/systemabilitymgr/safwk" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "component": { -+ "name": "safwk", -+ "subsystem": "systemabilitymgr", -+ "features": [ "safwk_feature_coverage = false" ], -+ "adapted_system_type": [ -+ "standard" -+ ], -+ "rom": "200KB", -+ "ram": "7130KB", -+ "deps": { -+ "components": [ -+ "hitrace_native", -+ "hiviewdfx_hilog_native", -+ "ipc", -+ "samgr", -+ "c_utils" -+ ], -+ "third_party": [ "libxml2" ] -+ }, -+ "build": { -+ "group_type": { -+ "base_group": [ -+ "//foundation/systemabilitymgr/safwk/services/safwk:sa_main", -+ "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk" -+ ], -+ "fwk_group": [], -+ "service_group": [] -+ }, -+ "inner_kits": [ -+ { -+ "header": { -+ "header_base": "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", -+ "header_files": [ -+ "system_ability.h" -+ ] -+ }, -+ "name": "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk" -+ } -+ ], -+ "test": [ -+ "//foundation/systemabilitymgr/safwk/test:unittest" -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/BUILD.gn -new file mode 100644 -index 0000000..57dcce2 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/BUILD.gn -@@ -0,0 +1,41 @@ -+# Copyright (c) 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") -+import("//build/ohos_var.gni") -+ -+# 建立所需头文件链接 -+exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/safwk/system_ability.h", "--dest_target", -+ rebase_path("//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h") ], "string") -+ -+exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/safwk", "--dest_target", -+ rebase_path("//foundation/systemabilitymgr/safwk/services/safwk/include") ], "string") -+ -+config("system_ability_config") { -+ visibility = [ ":*" ] -+ include_dirs = [ -+ "../../../services/safwk/include", -+ "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", -+ ] -+} -+ -+ohos_prebuilt_shared_library("system_ability_fwk") { -+ source = "/usr/lib64/libsystem_ability_fwk.z.so" -+ -+ public_configs = [ ":system_ability_config" ] -+ -+ install_images = [ system_base_dir ] -+ relative_install_dir = "platformsdk" -+ part_name = "safwk" -+ subsystem_name = "systemabilitymgr" -+} -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/services/safwk/BUILD.gn b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/services/safwk/BUILD.gn -new file mode 100644 -index 0000000..a258444 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/services/safwk/BUILD.gn -@@ -0,0 +1,22 @@ -+# Copyright (c) 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") -+ -+ohos_prebuilt_executable("sa_main") { -+ source = "/usr/bin/sa_main" -+ install_enable = true -+ -+ part_name = "safwk" -+ subsystem_name = "systemabilitymgr" -+} -\ No newline at end of file --- -2.33.0 - diff --git a/0019-feat-add-devicemanager-gn-files.patch b/0019-feat-add-devicemanager-gn-files.patch deleted file mode 100644 index d0e74d564374812cfa0ebef459a913edc654b55e..0000000000000000000000000000000000000000 --- a/0019-feat-add-devicemanager-gn-files.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 7c774820edb327a81e0be9f7891d45bf4eee9ac7 Mon Sep 17 00:00:00 2001 -From: tian2020 -Date: Fri, 16 Jun 2023 15:17:37 +0800 -Subject: [PATCH 3/3] feat:add devicemanager gn files - ---- - .../device_manager/BUILD.gn | 17 ++++ - .../device_manager/bundle.json | 80 +++++++++++++++++++ - .../interfaces/inner_kits/native_cpp/BUILD.gn | 39 +++++++++ - 3 files changed, 136 insertions(+) - create mode 100644 openeuler/compiler_gn/foundation/distributedhardware/device_manager/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json - create mode 100644 openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/BUILD.gn - -diff --git a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/BUILD.gn b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/BUILD.gn -new file mode 100644 -index 0000000..df46546 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/BUILD.gn -@@ -0,0 +1,17 @@ -+# Copyright (c) 2022 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. -+group("device_manager_fwk") { -+ deps = [ -+ "interfaces/inner_kits/native_cpp:devicemanagersdk", -+ ] -+} -diff --git a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json -new file mode 100644 -index 0000000..51c3d9a ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json -@@ -0,0 +1,80 @@ -+{ -+ "name": "@ohos/device_manager", -+ "description": "device manager service", -+ "version": "3.1", -+ "license": "Apache License 2.0", -+ "repository": "https://gitee.com/openharmony/device_manager", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "foundation/distributedhardware/device_manager" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "component": { -+ "name": "device_manager", -+ "subsystem": "distributedhardware", -+ "syscap":[ "SystemCapability.DistributedHardware.DeviceManager" ], -+ "features":["device_manager_no_interaction_auth"], -+ "adapted_system_type": [ "standard", "small" ], -+ "rom": "2M", -+ "ram": "16M", -+ "hisysevent_config": [ -+ "//foundation/distributedhardware/device_manager/hisysevent.yaml" -+ ], -+ "deps": { -+ "components": [ -+ "ability_base", -+ "ability_runtime", -+ "access_token", -+ "appexecfwk_standard", -+ "bundle_framework", -+ "c_utils", -+ "common_event_service", -+ "device_auth", -+ "dsoftbus", -+ "hisysevent_native", -+ "hitrace_native", -+ "hiviewdfx_hilog_native", -+ "init", -+ "ipc", -+ "napi", -+ "os_account", -+ "safwk", -+ "samgr", -+ "startup_l2" -+ ], -+ "third_party": [ -+ "json", -+ "node", -+ "googletest", -+ "mbedtls" -+ ] -+ }, -+ "build": { -+ "group_type": { -+ "base_group": [], -+ "fwk_group": [ -+ "//foundation/distributedhardware/device_manager:device_manager_fwk" -+ ], -+ "service_group": [] -+ }, -+ "inner_kits": [ -+ { -+ "type": "so", -+ "name": "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", -+ "header": { -+ "header_files": [ -+ "device_manager.h", -+ "device_manager_callback.h", -+ "dm_device_info.h", -+ "dm_publish_info.h", -+ "dm_subscribe_info.h" -+ ], -+ "header_base": "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include" -+ } -+ } -+ ], -+ "test": [] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/BUILD.gn b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/BUILD.gn -new file mode 100644 -index 0000000..78c60d7 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/BUILD.gn -@@ -0,0 +1,39 @@ -+# Copyright (c) 2022 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") -+ -+exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/device_manager", "--dest_target", -+ rebase_path("//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include") ], "string") -+ -+config("devicemanagersdk_config") { -+ include_dirs = [ -+ "include", -+ "include/ipc", -+ "include/ipc/standard", -+ "include/notify", -+ "include/common/include", -+ "include/common/include/ipc", -+ "include/common/include/ipc/model", -+ "include/common/include/ipc/standard", -+ "include/common/include/dfx", -+ "include/common/include/dfx/standard", -+ ] -+} -+ -+ohos_prebuilt_shared_library("devicemanagersdk") { -+ source = "/usr/lib64/libdevicemanagersdk.z.so" -+ public_configs = [ ":devicemanagersdk_config" ] -+ -+ subsystem_name = "distributedhardware" -+ part_name = "device_manager" -+} --- -2.33.0 - diff --git a/0020-add-some-components-to-build.patch b/0020-add-some-components-to-build.patch deleted file mode 100644 index f34814d630c13a417ed8fb8fe1255497b30193e6..0000000000000000000000000000000000000000 --- a/0020-add-some-components-to-build.patch +++ /dev/null @@ -1,1426 +0,0 @@ -From d34011ba040765c53a20df8f18e0e13c8bd5f995 Mon Sep 17 00:00:00 2001 -From: heppen -Date: Tue, 20 Jun 2023 22:50:55 +0800 -Subject: [PATCH] add some components to build - ---- - .../security/dataclassification/bundle.json | 49 ++++ - .../innerkits/datatransmitmgr/BUILD.gn | 29 +++ - .../innerkits/datatransmitmgr/include | 1 + - .../base/security/device_auth/bundle.json | 64 +++++ - .../security/device_auth/interfaces/innerkits | 1 + - .../security/device_auth/services/BUILD.gn | 23 ++ - .../compiler_gn/base/startup/init/bundle.json | 77 ++++++ - .../init/interfaces/innerkits/BUILD.gn | 43 ++++ - .../startup/init/interfaces/innerkits/include | 1 + - .../commonlibrary/c_utils/base/BUILD.gn | 33 +++ - .../commonlibrary/c_utils/base/include | 1 + - .../commonlibrary/c_utils/bundle.json | 103 ++++++++ - .../communication/dsoftbus/BUILD.gn | 20 ++ - .../communication/dsoftbus/bundle.json | 86 +++++++ - .../dsoftbus/interfaces/inner_kits/transport | 1 + - .../interfaces/kits/bus_center/include | 1 + - .../dsoftbus/interfaces/kits/common/include | 1 + - .../interfaces/kits/discovery/include | 1 + - .../interfaces/kits/transport/include | 1 + - .../communication/dsoftbus/sdk/BUILD.gn | 36 +++ - .../foundation/communication/ipc/BUILD.gn | 29 +++ - .../foundation/communication/ipc/bundle.json | 103 ++++++++ - .../interfaces/innerkits/ipc_core/BUILD.gn | 30 +++ - .../ipc/interfaces/innerkits/ipc_core/include | 1 + - .../interfaces/innerkits/ipc_single/BUILD.gn | 27 ++ - .../interfaces/innerkits/libdbinder/BUILD.gn | 31 +++ - .../interfaces/innerkits/libdbinder/include | 1 + - .../device_manager/bundle.json | 3 - - .../interfaces/inner_kits/native_cpp/include | 1 + - .../innerkits/safwk/system_ability.h | 1 + - .../bounds_checking_function/BUILD.gn | 6 +- - .../compiler_gn/third_party/json/include | 1 + - .../third_party/json/single_include | 1 + - .../compiler_gn/third_party/openssl/BUILD.gn | 39 +++ - .../third_party/openssl/include/openssl | 1 + - .../vendor/openeuler/openeuler/config.json | 232 ++++++++++-------- - 36 files changed, 977 insertions(+), 102 deletions(-) - create mode 100644 openeuler/compiler_gn/base/security/dataclassification/bundle.json - create mode 100644 openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/BUILD.gn - create mode 120000 openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include - create mode 100644 openeuler/compiler_gn/base/security/device_auth/bundle.json - create mode 120000 openeuler/compiler_gn/base/security/device_auth/interfaces/innerkits - create mode 100644 openeuler/compiler_gn/base/security/device_auth/services/BUILD.gn - create mode 100644 openeuler/compiler_gn/base/startup/init/bundle.json - create mode 100644 openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn - create mode 120000 openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include - create mode 100644 openeuler/compiler_gn/commonlibrary/c_utils/base/BUILD.gn - create mode 120000 openeuler/compiler_gn/commonlibrary/c_utils/base/include - create mode 100644 openeuler/compiler_gn/commonlibrary/c_utils/bundle.json - create mode 100644 openeuler/compiler_gn/foundation/communication/dsoftbus/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/communication/dsoftbus/bundle.json - create mode 120000 openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/inner_kits/transport - create mode 120000 openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/bus_center/include - create mode 120000 openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/common/include - create mode 120000 openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/discovery/include - create mode 120000 openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/transport/include - create mode 100644 openeuler/compiler_gn/foundation/communication/dsoftbus/sdk/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/communication/ipc/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/communication/ipc/bundle.json - create mode 100644 openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/BUILD.gn - create mode 120000 openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/include - create mode 100644 openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_single/BUILD.gn - create mode 100644 openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/BUILD.gn - create mode 120000 openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/include - create mode 120000 openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include - create mode 120000 openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h - create mode 120000 openeuler/compiler_gn/third_party/json/include - create mode 120000 openeuler/compiler_gn/third_party/json/single_include - create mode 100644 openeuler/compiler_gn/third_party/openssl/BUILD.gn - create mode 120000 openeuler/compiler_gn/third_party/openssl/include/openssl - -diff --git a/openeuler/compiler_gn/base/security/dataclassification/bundle.json b/openeuler/compiler_gn/base/security/dataclassification/bundle.json -new file mode 100644 -index 0000000..d0efa8f ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/dataclassification/bundle.json -@@ -0,0 +1,49 @@ -+{ -+ "name": "@ohos/dataclassification", -+ "description": "data transmission control", -+ "version": "3.1", -+ "license": "Apache License 2.0", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "base/security/dataclassification" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "component": { -+ "name": "dataclassification", -+ "subsystem": "security", -+ "syscap": [ -+ "SystemCapability.Security.DataTransitManager" -+ ], -+ "features": [ -+ "dataclassification_datatransmitmgr" -+ ], -+ "adapted_system_type": [ -+ "standard" -+ ], -+ "rom": "50KB", -+ "ram": "50KB", -+ "deps": { -+ "components": [ -+ "device_security_level", -+ "hiviewdfx_hilog_native" -+ ], -+ "third_party": [] -+ }, -+ "build": { -+ "sub_component": [ -+ ], -+ "inner_kits": [ -+ { -+ "name": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr", -+ "header": { -+ "header_files": [ -+ "dev_slinfo_mgr.h" -+ ], -+ "header_base": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include" -+ } -+ } -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/BUILD.gn b/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/BUILD.gn -new file mode 100644 -index 0000000..f0d5bd6 ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/BUILD.gn -@@ -0,0 +1,29 @@ -+# Copyright (C) 2022 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") -+ -+################################################################ -+# C, Main source file here. -+################################################################ -+config("datatransmitmgr_config") { -+ include_dirs = [ "include" ] -+} -+ -+ohos_prebuilt_shared_library("data_transit_mgr") { -+ source = "/usr/lib64/libdata_transit_mgr.z.so" -+ public_configs = [ ":datatransmitmgr_config" ] -+ subsystem_name = "security" -+ part_name = "dataclassification" -+ install_enable = false -+} -\ No newline at end of file -diff --git a/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include b/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include -new file mode 120000 -index 0000000..ddadbd2 ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include -@@ -0,0 +1 @@ -+/usr/include/dataclassification -\ No newline at end of file -diff --git a/openeuler/compiler_gn/base/security/device_auth/bundle.json b/openeuler/compiler_gn/base/security/device_auth/bundle.json -new file mode 100644 -index 0000000..29de22b ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/device_auth/bundle.json -@@ -0,0 +1,64 @@ -+{ -+ "name": "@ohos/deviceauth", -+ "version": "3.1", -+ "description": "The device authentication module belongs to the security subsystem of OpenHarmony. It manages the entire lifecycle of trust relationships between devices.", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "base/security/device_auth" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "author": {}, -+ "repository": "", -+ "license": "Apache License 2.0", -+ "component": { -+ "name": "device_auth", -+ "subsystem": "security", -+ "syscap": [ "SystemCapability.Security.DeviceAuth" ], -+ "features": [], -+ "adapted_system_type": [ -+ "standard", -+ "small", -+ "mini" -+ ], -+ "rom": "500KB", -+ "ram": "500KB", -+ "deps": { -+ "components": [ -+ "dsoftbus", -+ "safwk", -+ "os_account", -+ "access_token", -+ "security", -+ "common", -+ "utils_base", -+ "hiviewdfx_hilog_native", -+ "hisysevent_native", -+ "samgr", -+ "ipc" -+ ], -+ "third_party": [ -+ "cJSON", -+ "bounds_checking_function", -+ "mbedtls", -+ "openssl" -+ ] -+ }, -+ "build": { -+ "sub_component": [ -+ ], -+ "inner_kits": [ -+ { -+ "name": "//base/security/device_auth/services:deviceauth_sdk", -+ "header": { -+ "header_files": [ -+ "device_auth_defines.h", -+ "device_auth.h" -+ ], -+ "header_base": "//base/security/device_auth/interfaces/innerkits" -+ } -+ } -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/base/security/device_auth/interfaces/innerkits b/openeuler/compiler_gn/base/security/device_auth/interfaces/innerkits -new file mode 120000 -index 0000000..78a4136 ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/device_auth/interfaces/innerkits -@@ -0,0 +1 @@ -+/usr/include/device_auth -\ No newline at end of file -diff --git a/openeuler/compiler_gn/base/security/device_auth/services/BUILD.gn b/openeuler/compiler_gn/base/security/device_auth/services/BUILD.gn -new file mode 100644 -index 0000000..c507605 ---- /dev/null -+++ b/openeuler/compiler_gn/base/security/device_auth/services/BUILD.gn -@@ -0,0 +1,23 @@ -+# Copyright (C) 2021-2022 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("deviceauth_config") { -+ include_dirs = [ "//base/security/device_auth/interfaces/innerkits" ] -+ libs = [ "deviceauth_sdk.z" ] -+} -+ -+group("deviceauth_sdk") { -+ public_configs = [ ":deviceauth_config" ] -+} -diff --git a/openeuler/compiler_gn/base/startup/init/bundle.json b/openeuler/compiler_gn/base/startup/init/bundle.json -new file mode 100644 -index 0000000..86a8022 ---- /dev/null -+++ b/openeuler/compiler_gn/base/startup/init/bundle.json -@@ -0,0 +1,77 @@ -+{ -+ "name": "@ohos/startup_init_lite", -+ "description": "ohos init process", -+ "homePage": "https://gitee.com/openharmony", -+ "version": "3.1", -+ "license": "Apache License 2.0", -+ "repository": "https://gitee.com/openharmony/startup_init_lite", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "base/startup/init" -+ }, -+ "dirs": {}, -+ "scripts": {}, -+ "component": { -+ "name": "init", -+ "subsystem": "startup", -+ "syscap": [ -+ "SystemCapability.Startup.SystemInfo" -+ ], -+ "adapted_system_type": [ -+ "standard" -+ ], -+ "rom": "", -+ "ram": "", -+ "deps": { -+ "components": [ -+ "startup", -+ "c_utils" -+ ], -+ "third_party": [ -+ "cJSON", -+ "bounds_checking_function" -+ ] -+ }, -+ "build": { -+ "group_type": { -+ "base_group": [ -+ ], -+ "fwk_group": [ -+ ], -+ "service_group": [ -+ ] -+ }, -+ "sub_component": [ -+ ], -+ "inner_kits": [ -+ { -+ "header": { -+ "header_base": "//base/startup/init/interfaces/innerkits/include/", -+ "header_files": [ -+ "service_control.h", -+ "beget_ext.h", -+ "syspara/parameter.h", -+ "syspara/parameters.h", -+ "syspara/param_wrapper.h", -+ "syspara/sysparam_errno.h" -+ ] -+ }, -+ "name": "//base/startup/init/interfaces/innerkits:libbegetutil" -+ }, -+ { -+ "header": { -+ "header_base": "//base/startup/init/interfaces/innerkits/include/", -+ "header_files": [ -+ "service_watcher.h", -+ "syspara/parameter.h", -+ "syspara/sysparam_errno.h" -+ ] -+ }, -+ "name": "//base/startup/init/interfaces/innerkits:libbeget_proxy" -+ } -+ ], -+ "test": [ -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn -new file mode 100644 -index 0000000..e0098e1 ---- /dev/null -+++ b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/BUILD.gn -@@ -0,0 +1,43 @@ -+# Copyright (c) 2021-2022 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("libbegetutil_config") { -+ include_dirs = [ -+ "//base/startup/init/interfaces/innerkits/include", -+ "//base/startup/init/interfaces/innerkits/include/syspara", -+ "//base/startup/init/services/include", -+ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", -+ ] -+ libs = [ "begetutil.z" ] -+} -+ -+config("libbeget_proxy_config") { -+ include_dirs = [ -+ "//base/startup/init/interfaces/innerkits/include", -+ "//base/startup/init/interfaces/innerkits/include/syspara", -+ "//base/startup/init/services/include", -+ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", -+ ] -+ libs = [ "beget_proxy.z" ] -+} -+ -+group("libbegetutil") { -+ public_configs = [ ":libbegetutil_config" ] -+} -+ -+# watcher lib must separate compilation avoid interdependence. -+group("libbeget_proxy") { -+ public_configs = [ ":libbeget_proxy_config" ] -+} -+ -diff --git a/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include -new file mode 120000 -index 0000000..d5f3932 ---- /dev/null -+++ b/openeuler/compiler_gn/base/startup/init/interfaces/innerkits/include -@@ -0,0 +1 @@ -+/usr/include/init -\ No newline at end of file -diff --git a/openeuler/compiler_gn/commonlibrary/c_utils/base/BUILD.gn b/openeuler/compiler_gn/commonlibrary/c_utils/base/BUILD.gn -new file mode 100644 -index 0000000..fecacb3 ---- /dev/null -+++ b/openeuler/compiler_gn/commonlibrary/c_utils/base/BUILD.gn -@@ -0,0 +1,33 @@ -+# Copyright (c) 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("utils_configs") { -+ include_dirs = [ "include" ] -+ libs = [ "utils.z" ] -+} -+ -+config("utilsbase_config") { -+ include_dirs = [ "include" ] -+ libs = [ "utilsbase.z" ] -+} -+ -+group("utilsbase") { -+ all_dependent_configs = [ ":utilsbase_config" ] -+ public_configs = [ ":utilsbase_config" ] -+} -+ -+group("utils") { -+ all_dependent_configs = [ ":utils_configs" ] -+ public_configs = [ ":utils_configs" ] -+} -diff --git a/openeuler/compiler_gn/commonlibrary/c_utils/base/include b/openeuler/compiler_gn/commonlibrary/c_utils/base/include -new file mode 120000 -index 0000000..6ed1680 ---- /dev/null -+++ b/openeuler/compiler_gn/commonlibrary/c_utils/base/include -@@ -0,0 +1 @@ -+/usr/include/c_utils -\ No newline at end of file -diff --git a/openeuler/compiler_gn/commonlibrary/c_utils/bundle.json b/openeuler/compiler_gn/commonlibrary/c_utils/bundle.json -new file mode 100644 -index 0000000..3983446 ---- /dev/null -+++ b/openeuler/compiler_gn/commonlibrary/c_utils/bundle.json -@@ -0,0 +1,103 @@ -+{ -+ "name": "@openharmony/c_utils", -+ "version": "3.1.0", -+ "description": "c_utils", -+ "publishAs": "code-segment", -+ "segment": { -+ "destPath": "commonlibrary/c_utils" -+ }, -+ "scripts": { -+ "install": "DEST_PATH=${DEP_BUNDLE_BASE}/commonlibrary/c_utils/base && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" -+ }, -+ "author": {}, -+ "repository": "", -+ "license": "Apache License 2.0", -+ "component": { -+ "name": "c_utils", -+ "subsystem": "commonlibrary", -+ "adapted_system_type": [ "standard" ], -+ "deps": { -+ "components": [ -+ "hilog_native" -+ ], -+ "third_party": [] -+ }, -+ "build": { -+ "sub_component": [ -+ ], -+ "inner_kits": [ -+ { -+ "name": "//commonlibrary/c_utils/base:utils", -+ "header": { -+ "header_files": [ -+ "ashmem.h", -+ "common_errors.h", -+ "common_timer_errors.h", -+ "datetime_ex.h", -+ "directory_ex.h", -+ "errors.h", -+ "file_ex.h", -+ "flat_obj.h", -+ "nocopyable.h", -+ "observer.h", -+ "parcel.h", -+ "pubdef.h", -+ "refbase.h", -+ "rwlock.h", -+ "safe_block_queue.h", -+ "safe_map.h", -+ "safe_queue.h", -+ "securec.h", -+ "securectype.h", -+ "semaphore_ex.h", -+ "singleton.h", -+ "sorted_vector.h", -+ "string_ex.h", -+ "thread_ex.h", -+ "thread_pool.h", -+ "timer.h", -+ "unique_fd.h" -+ ], -+ "header_base": "//commonlibrary/c_utils/base/include" -+ } -+ }, -+ { -+ "name": "//commonlibrary/c_utils/base:utilsbase", -+ "header": { -+ "header_files": [ -+ "ashmem.h", -+ "common_errors.h", -+ "common_timer_errors.h", -+ "datetime_ex.h", -+ "directory_ex.h", -+ "errors.h", -+ "file_ex.h", -+ "flat_obj.h", -+ "nocopyable.h", -+ "observer.h", -+ "parcel.h", -+ "pubdef.h", -+ "refbase.h", -+ "rwlock.h", -+ "safe_block_queue.h", -+ "safe_map.h", -+ "safe_queue.h", -+ "securec.h", -+ "securectype.h", -+ "semaphore_ex.h", -+ "singleton.h", -+ "sorted_vector.h", -+ "string_ex.h", -+ "thread_ex.h", -+ "thread_pool.h", -+ "timer.h", -+ "unique_fd.h" -+ ], -+ "header_base": "//commonlibrary/c_utils/base/include" -+ } -+ } -+ ] -+ } -+ } -+ } -+ -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/BUILD.gn b/openeuler/compiler_gn/foundation/communication/dsoftbus/BUILD.gn -new file mode 100644 -index 0000000..2faff16 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/BUILD.gn -@@ -0,0 +1,20 @@ -+# Copyright (c) 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("//foundation/communication/dsoftbus/dsoftbus.gni") -+ -+lite_component("dsoftbus") { -+ features = [ -+ "sdk:softbus_client", -+ ] -+} -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/bundle.json b/openeuler/compiler_gn/foundation/communication/dsoftbus/bundle.json -new file mode 100644 -index 0000000..06860b7 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/bundle.json -@@ -0,0 +1,86 @@ -+{ -+ "name": "@openharmony/dsoftbus", -+ "version": "3.1.0", -+ "description": "dsoftbus", -+ "publishAs": "code-segment", -+ "scripts": { -+ "install": "DEST_PATH=${DEP_BUNDLE_BASE}/foundation/communication/dsoftbus && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" -+ }, -+ "author": {}, -+ "repository": "", -+ "license": "Apache License 2.0", -+ "segment": { -+ "destPath": "foundation/communication/dsoftbus" -+ }, -+ "component": { -+ "name": "dsoftbus", -+ "subsystem": "communication", -+ "adapted_system_type": [ -+ "mini", -+ "small", -+ "standard" -+ ], -+ "syscap":[ "SystemCapability.Communication.SoftBus.Core" ], -+ "features": [ -+ "dsoftbus_feature_conn_p2p", -+ "dsoftbus_feature_disc_ble", -+ "dsoftbus_feature_conn_br", -+ "dsoftbus_feature_conn_ble", -+ "dsoftbus_feature_lnn_net", -+ "dsoftbus_feature_trans_udp_stream", -+ "dsoftbus_feature_trans_udp_file", -+ "dsoftbus_get_devicename", -+ "dsoftbus_feature_product_config_path", -+ "dsoftbus_feature_ifname_prefix", -+ "dsoftbus_feature_lnn_wifiservice_dependence", -+ "dsoftbus_standard_feature_dfinder_support_multi_nif", -+ "dsoftbus_feature_protocol_newip" -+ ], -+ "rom": "967KB", -+ "ram": "28MB", -+ "deps": { -+ "components": [ -+ "ability_base", -+ "ability_runtime", -+ "bluetooth", -+ "drivers_interface_wlan", -+ "hiviewdfx_hilog_native", -+ "ipc", -+ "os_account", -+ "relational_store", -+ "c_utils", -+ "wifi" -+ ], -+ "third_party": [ -+ "bounds_checking_function", -+ "cJSON", -+ "libcoap", -+ "thirdparty_mbedtls" -+ ] -+ }, -+ "build": { -+ "group_type":{ -+ "base_group":[], -+ "fwk_group":[ -+ "//foundation/communication/dsoftbus/sdk:softbus_client" -+ ], -+ "service_group":[ -+ ] -+ }, -+ "inner_kits": [ -+ { -+ "name": "//foundation/communication/dsoftbus/sdk:softbus_client", -+ "header": { -+ "header_files": [ -+ "bus_center/softbus_bus_center.h", -+ "common/softbus_common.h", -+ "discovery/discovery_service.h", -+ "transport/session.h" -+ ], -+ "header_base": "//foundation/communication/dsoftbus/interfaces/kits" -+ } -+ } -+ ] -+ } -+ } -+} -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/inner_kits/transport b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/inner_kits/transport -new file mode 120000 -index 0000000..acb01c5 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/inner_kits/transport -@@ -0,0 +1 @@ -+/usr/include/dsoftbus -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/bus_center/include b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/bus_center/include -new file mode 120000 -index 0000000..acb01c5 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/bus_center/include -@@ -0,0 +1 @@ -+/usr/include/dsoftbus -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/common/include b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/common/include -new file mode 120000 -index 0000000..acb01c5 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/common/include -@@ -0,0 +1 @@ -+/usr/include/dsoftbus -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/discovery/include b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/discovery/include -new file mode 120000 -index 0000000..acb01c5 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/discovery/include -@@ -0,0 +1 @@ -+/usr/include/dsoftbus -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/transport/include b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/transport/include -new file mode 120000 -index 0000000..acb01c5 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/interfaces/kits/transport/include -@@ -0,0 +1 @@ -+/usr/include/dsoftbus -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/dsoftbus/sdk/BUILD.gn b/openeuler/compiler_gn/foundation/communication/dsoftbus/sdk/BUILD.gn -new file mode 100644 -index 0000000..73934c3 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/dsoftbus/sdk/BUILD.gn -@@ -0,0 +1,36 @@ -+# Copyright (c) 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") -+import("//build/ohos_var.gni") -+ -+dsoftbus_root_path = "//foundation/communication/dsoftbus" -+ -+config("dsoftbus_sdk_interface") { -+ include_dirs = [ -+ "$dsoftbus_root_path/interfaces/kits", -+ "$dsoftbus_root_path/interfaces/kits/bus_center", -+ "$dsoftbus_root_path/interfaces/kits/common", -+ "$dsoftbus_root_path/interfaces/kits/discovery", -+ "$dsoftbus_root_path/interfaces/kits/transport", -+ "$dsoftbus_root_path/sdk/transmission/session/cpp/include", -+ "$dsoftbus_root_path/interfaces/inner_kits/transport", -+ "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include", -+ ] -+ libs = [ "softbus_client.z" ] -+} -+ -+group("softbus_client") { -+ public_configs = [ ":dsoftbus_sdk_interface" ] -+ all_dependent_configs = [ ":dsoftbus_sdk_interface" ] -+} -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/BUILD.gn b/openeuler/compiler_gn/foundation/communication/ipc/BUILD.gn -new file mode 100644 -index 0000000..7b6d93d ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/BUILD.gn -@@ -0,0 +1,29 @@ -+# Copyright (C) 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") -+import("//build/ohos_var.gni") -+ -+SUBSYSTEM_DIR = "//foundation/communication/ipc" -+IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native" -+ -+config("ipc_util_config") { -+ # header file path -+ -+ include_dirs = [ -+ "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include", -+ "$IPC_CORE_ROOT/src/core/include", -+ "$IPC_CORE_ROOT/src/mock/include", -+ "//commonlibrary/c_utils/base/include", -+ ] -+} -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/bundle.json b/openeuler/compiler_gn/foundation/communication/ipc/bundle.json -new file mode 100644 -index 0000000..3110b6f ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/bundle.json -@@ -0,0 +1,103 @@ -+{ -+ "name": "@openharmony/ipc", -+ "version": "3.1.0", -+ "description": "ipc", -+ "publishAs": "code-segment", -+ "scripts": { -+ "install": "DEST_PATH=${DEP_BUNDLE_BASE}/foundation/communication/ipc && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" -+ }, -+ "author": {}, -+ "repository": "", -+ "license": "Apache License 2.0", -+ "segment": { -+ "destPath": "foundation/communication/ipc" -+ }, -+ "component": { -+ "name": "ipc", -+ "subsystem": "communication", -+ "adapted_system_type": [ -+ "standard", -+ "small", -+ "mini" -+ ], -+ "features": [ -+ "ipc_feature_rpc_enabled" -+ ], -+ "syscap":[ -+ "SystemCapability.Communication.IPC.Core" -+ ], -+ "rom": "500KB", -+ "ram": "100KB", -+ "deps": { -+ "components": [ -+ "samgr", -+ "hitrace_native", -+ "hiviewdfx_hilog_native", -+ "c_utils", -+ "access_token", -+ "dsoftbus" -+ ], -+ "third_party": [ -+ "bounds_checking_function" -+ ] -+ }, -+ "build": { -+ "sub_component": [ -+ ], -+ "inner_kits": [ -+ { -+ "name": "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", -+ "header": { -+ "header_files": [ -+ "ipc_types.h", -+ "ipc_skeleton.h", -+ "iremote_object.h", -+ "iremote_proxy.h", -+ "iremote_stub.h", -+ "message_parcel.h", -+ "message_option.h", -+ "iremote_broker.h", -+ "ipc_object_proxy.h", -+ "ipc_object_stub.h", -+ "peer_holder.h", -+ "ipc_file_descriptor.h", -+ "jni_help.h" -+ ], -+ "header_base": "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include" -+ } -+ }, -+ { -+ "name": "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", -+ "header": { -+ "header_files": [ -+ "ipc_types.h", -+ "ipc_skeleton.h", -+ "iremote_object.h", -+ "iremote_proxy.h", -+ "iremote_stub.h", -+ "message_parcel.h", -+ "message_option.h", -+ "iremote_broker.h", -+ "ipc_object_proxy.h", -+ "ipc_object_stub.h", -+ "peer_holder.h", -+ "ipc_file_descriptor.h", -+ "jni_help.h" -+ ], -+ "header_base": "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include" -+ } -+ }, -+ { -+ "name": "//foundation/communication/ipc/interfaces/innerkits/libdbinder:libdbinder", -+ "header": { -+ "header_files": [ -+ "dbinder_service.h", -+ "dbinder_service_stub.h" -+ ], -+ "header_base": "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include" -+ } -+ } -+ ] -+ } -+ } -+ } -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/BUILD.gn b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/BUILD.gn -new file mode 100644 -index 0000000..c2ecc90 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/BUILD.gn -@@ -0,0 +1,30 @@ -+# Copyright (C) 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") -+ -+SUBSYSTEM_DIR = "//foundation/communication/ipc" -+ -+config("ipc_all_deps_config") { -+ include_dirs = [ "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include" ] -+ libs = [ "ipc_core.z" ] -+} -+ -+group("ipc_core") { -+ public_configs = [ -+ "$SUBSYSTEM_DIR:ipc_util_config", -+ ":ipc_all_deps_config" -+ ] -+ -+ all_dependent_configs = [ ":ipc_all_deps_config" ] -+} -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/include b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/include -new file mode 120000 -index 0000000..a2e1fc6 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_core/include -@@ -0,0 +1 @@ -+/usr/include/ipc -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_single/BUILD.gn b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_single/BUILD.gn -new file mode 100644 -index 0000000..e2689e4 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/ipc_single/BUILD.gn -@@ -0,0 +1,27 @@ -+# Copyright (C) 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") -+ -+SUBSYSTEM_DIR = "//foundation/communication/ipc" -+ -+config("libipc_single_config") { -+ libs = [ "ipc_single.z" ] -+} -+ -+group("ipc_single") { -+ public_configs = [ -+ "$SUBSYSTEM_DIR:ipc_util_config", -+ ":libipc_single_config" -+ ] -+} -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/BUILD.gn b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/BUILD.gn -new file mode 100644 -index 0000000..83d1cbd ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/BUILD.gn -@@ -0,0 +1,31 @@ -+# Copyright (C) 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") -+ -+SUBSYSTEM_DIR = "//foundation/communication/ipc" -+DBINDER_ROOT = "$SUBSYSTEM_DIR/services/dbinder" -+ -+config("libdbinder_config") { -+ include_dirs = [ -+ "//commonlibrary/c_utils/base/include", -+ "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include", -+ "$SUBSYSTEM_DIR/interfaces/innerkits/libdbinder/include", -+ "$DBINDER_ROOT/dbinder_service/include", -+ ] -+ libs = [ "libdbinder.z" ] -+} -+ -+group("libdbinder") { -+ public_configs = [ ":libdbinder_config" ] -+} -diff --git a/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/include b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/include -new file mode 120000 -index 0000000..a2e1fc6 ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/communication/ipc/interfaces/innerkits/libdbinder/include -@@ -0,0 +1 @@ -+/usr/include/ipc -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json -index 51c3d9a..a8238af 100644 ---- a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json -+++ b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/bundle.json -@@ -18,9 +18,6 @@ - "adapted_system_type": [ "standard", "small" ], - "rom": "2M", - "ram": "16M", -- "hisysevent_config": [ -- "//foundation/distributedhardware/device_manager/hisysevent.yaml" -- ], - "deps": { - "components": [ - "ability_base", -diff --git a/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include -new file mode 120000 -index 0000000..24a5d3b ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include -@@ -0,0 +1 @@ -+/usr/include/device_manager -\ No newline at end of file -diff --git a/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h -new file mode 120000 -index 0000000..b20907a ---- /dev/null -+++ b/openeuler/compiler_gn/foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h -@@ -0,0 +1 @@ -+/usr/include/safwk/system_ability.h -\ No newline at end of file -diff --git a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn -index ae44b79..cc72607 100644 ---- a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn -+++ b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn -@@ -17,12 +17,14 @@ config("libsec_public_config") { - libs = [ "boundscheck" ] - } - --ohos_static_library("libsec_static") { -+group("libsec_static") { - #libs = [ "boundscheck" ] -+ public_configs = [ ":libsec_public_config" ] - all_dependent_configs = [ ":libsec_public_config" ] - } - --ohos_shared_library("libsec_shared") { -+group("libsec_shared") { - #libs = [ "boundscheck" ] -+ public_configs = [ ":libsec_public_config" ] - all_dependent_configs = [ ":libsec_public_config" ] - } -diff --git a/openeuler/compiler_gn/third_party/json/include b/openeuler/compiler_gn/third_party/json/include -new file mode 120000 -index 0000000..b8f52aa ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/json/include -@@ -0,0 +1 @@ -+/usr/include/nlohmann_json -\ No newline at end of file -diff --git a/openeuler/compiler_gn/third_party/json/single_include b/openeuler/compiler_gn/third_party/json/single_include -new file mode 120000 -index 0000000..a29b1e4 ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/json/single_include -@@ -0,0 +1 @@ -+/usr/include/nlohmann_json/single_include -\ No newline at end of file -diff --git a/openeuler/compiler_gn/third_party/openssl/BUILD.gn b/openeuler/compiler_gn/third_party/openssl/BUILD.gn -new file mode 100644 -index 0000000..7b953eb ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/openssl/BUILD.gn -@@ -0,0 +1,39 @@ -+# Copyright (c) 2020-2022 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") -+ -+# Only use this to set/unset some cflags, use "platform" variable in gn template to add -+# source code for Windows. -+ -+config("libcrypto_config") { -+ include_dirs = [ "/usr/include/openssl" ] -+ libs = [ "crypto" ] -+} -+ -+group("libcrypto_static") { -+ public_configs = [ ":libcrypto_config" ] -+} -+ -+group("libcrypto_shared") { -+ public_configs = [ ":libcrypto_config" ] -+} -+ -+config("libssl_config") { -+ include_dirs = [ "/usr/include/openssl" ] -+ libs = [ "ssl" ] -+} -+ -+group("libssl_shared") { -+ public_configs = [ ":libssl_config" ] -+} -diff --git a/openeuler/compiler_gn/third_party/openssl/include/openssl b/openeuler/compiler_gn/third_party/openssl/include/openssl -new file mode 120000 -index 0000000..6c29d44 ---- /dev/null -+++ b/openeuler/compiler_gn/third_party/openssl/include/openssl -@@ -0,0 +1 @@ -+/usr/include/openssl -\ No newline at end of file -diff --git a/openeuler/vendor/openeuler/openeuler/config.json b/openeuler/vendor/openeuler/openeuler/config.json -index 2dfbb49..1896a16 100644 ---- a/openeuler/vendor/openeuler/openeuler/config.json -+++ b/openeuler/vendor/openeuler/openeuler/config.json -@@ -1,115 +1,153 @@ - { -- "product_name": "openeuler", -- "device_company": "openeuler", -- "target_os": "linux", -- "type": "standard", -- "version": "3.0", -- "board": "openeuler", -- "api_version": 8, -- "enable_ramdisk": false, -- "build_selinux": false, -- "build_seccomp": false, -- "support_jsapi": false, -- "inherit": [], -- "subsystems": [ -- { -- "subsystem": "common", -- "components": [ -- { -- "component": "common" -- } -- ] -+ "product_name": "openeuler", -+ "device_company": "openeuler", -+ "target_os": "linux", -+ "type": "standard", -+ "version": "3.0", -+ "board": "openeuler", -+ "api_version": 8, -+ "enable_ramdisk": false, -+ "build_selinux": false, -+ "build_seccomp": false, -+ "support_jsapi": false, -+ "inherit": [], -+ "subsystems": [ -+ { -+ "subsystem": "common", -+ "components": [ -+ { -+ "component": "common" -+ } -+ ] -+ }, -+ { -+ "subsystem": "commonlibrary", -+ "components": [ -+ { -+ "component": "c_utils", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "hiviewdfx", -+ "components": [ -+ { -+ "component": "hilog_native", -+ "features": [] - }, - { -- "subsystem": "commonlibrary", -- "components": [ -- { -- "component": "c_utils", -- "features": [] -- } -- ] -+ "component": "hiviewdfx_hilog_native", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "notification", -+ "components": [ -+ { -+ "component": "eventhandler", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "startup", -+ "components": [ -+ { -+ "component": "init", -+ "features": [ -+ "enable_ohos_startup_init_feature_ab_partition = false", -+ "enable_ohos_startup_init_feature_loader = false" -+ ] -+ } -+ ] -+ }, -+ { -+ "subsystem": "security", -+ "components": [ -+ { -+ "component": "huks", -+ "features": [] - }, - { -- "subsystem": "hiviewdfx", -- "components": [ -- { -- "component": "hilog_native", -- "features": [] -- }, -- { -- "component": "hiviewdfx_hilog_native", -- "features": [] -- } -- ] -+ "component": "device_auth", -+ "features": [] - }, - { -- "subsystem": "notification", -- "components": [ -- { -- "component": "eventhandler", -- "features": [] -- } -- ] -+ "component": "dataclassification", -+ "features": [] - }, - { -- "subsystem": "startup", -- "components": [ -- { -- "component": "init", -- "features": [ -- "enable_ohos_startup_init_feature_ab_partition = false", -- "enable_ohos_startup_init_feature_loader = false" -- ] -- } -- ] -+ "component": "device_security_level", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "communication", -+ "components": [ -+ { -+ "component": "ipc", -+ "features": [] - }, - { -- "subsystem": "security", -- "components": [ -- { -- "component": "huks", -- "features": [] -- }, -- { -- "component": "device_auth", -- "features": [] -- } -- ] -+ "component": "dsoftbus", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "systemabilitymgr", -+ "components": [ -+ { -+ "component": "safwk", -+ "features": [] - }, - { -- "subsystem": "communication", -- "components": [ -- { -- "component": "ipc", -- "features": [] -- }, -- { -- "component": "dsoftbus", -- "features": [] -- } -- ] -+ "component": "samgr", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "distributedhardware", -+ "components": [ -+ { -+ "component": "device_manager", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "distributeddatamgr", -+ "components": [ -+ { -+ "component": "kv_store", -+ "features": [] -+ }, -+ { -+ "component": "relational_store", -+ "features": [] - }, - { -- "subsystem": "systemabilitymgr", -- "components": [ -- { -- "component": "safwk", -- "features": [] -- }, -- { -- "component": "samgr", -- "features": [] -- } -- ] -+ "component": "datamgr_service", -+ "features": [] - }, - { -- "subsystem": "distributedhardware", -- "components": [ -- { -- "component": "device_manager", -- "features": [] -- } -- ] -+ "component": "data_object", -+ "features": [] -+ } -+ ] -+ }, -+ { -+ "subsystem": "filemanagement", -+ "components": [ -+ { -+ "component": "dfs_service", -+ "features": [] - } -- ] --} -+ ] -+ } -+ ] -+} -\ No newline at end of file --- -2.33.0 - diff --git a/0020-feat-add-openssl-gn-file-and-soft-link.patch b/0020-feat-add-openssl-gn-file-and-soft-link.patch new file mode 100644 index 0000000000000000000000000000000000000000..af3514b868d97f3f9767b0d50131cadf1271b93e --- /dev/null +++ b/0020-feat-add-openssl-gn-file-and-soft-link.patch @@ -0,0 +1,68 @@ +From 536f71e3670ad6c821b980f6336c614dcf693d3e Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Wed, 8 Nov 2023 18:36:59 +0800 +Subject: [PATCH] add openssl + +--- + .../compiler_gn/third_party/openssl/BUILD.gn | 39 +++++++++++++++++++ + .../third_party/openssl/include/openssl | 1 + + 2 files changed, 40 insertions(+) + create mode 100644 openeuler/compiler_gn/third_party/openssl/BUILD.gn + create mode 120000 openeuler/compiler_gn/third_party/openssl/include/openssl + +diff --git a/openeuler/compiler_gn/third_party/openssl/BUILD.gn b/openeuler/compiler_gn/third_party/openssl/BUILD.gn +new file mode 100644 +index 0000000..7b953eb +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/openssl/BUILD.gn +@@ -0,0 +1,39 @@ ++# Copyright (c) 2020-2022 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") ++ ++# Only use this to set/unset some cflags, use "platform" variable in gn template to add ++# source code for Windows. ++ ++config("libcrypto_config") { ++ include_dirs = [ "/usr/include/openssl" ] ++ libs = [ "crypto" ] ++} ++ ++group("libcrypto_static") { ++ public_configs = [ ":libcrypto_config" ] ++} ++ ++group("libcrypto_shared") { ++ public_configs = [ ":libcrypto_config" ] ++} ++ ++config("libssl_config") { ++ include_dirs = [ "/usr/include/openssl" ] ++ libs = [ "ssl" ] ++} ++ ++group("libssl_shared") { ++ public_configs = [ ":libssl_config" ] ++} +diff --git a/openeuler/compiler_gn/third_party/openssl/include/openssl b/openeuler/compiler_gn/third_party/openssl/include/openssl +new file mode 120000 +index 0000000..6c29d44 +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/openssl/include/openssl +@@ -0,0 +1 @@ ++/usr/include/openssl +\ No newline at end of file +-- +2.33.0 + diff --git a/0021-feat-change-config-json.patch b/0021-feat-change-config-json.patch new file mode 100644 index 0000000000000000000000000000000000000000..a6bfb8460a4f9e7c0ae26a195a50751c395f9263 --- /dev/null +++ b/0021-feat-change-config-json.patch @@ -0,0 +1,268 @@ +From fa9833b5a52e5a69945d7241652e1f0273dc8039 Mon Sep 17 00:00:00 2001 +From: zxstty +Date: Tue, 14 Nov 2023 10:50:17 +0800 +Subject: [PATCH] 1 + +--- + .../vendor/openeuler/openeuler/config.json | 232 ++++++++++-------- + 1 file changed, 135 insertions(+), 97 deletions(-) + +diff --git a/openeuler/vendor/openeuler/openeuler/config.json b/openeuler/vendor/openeuler/openeuler/config.json +index 2dfbb49..1896a16 100644 +--- a/openeuler/vendor/openeuler/openeuler/config.json ++++ b/openeuler/vendor/openeuler/openeuler/config.json +@@ -1,115 +1,153 @@ + { +- "product_name": "openeuler", +- "device_company": "openeuler", +- "target_os": "linux", +- "type": "standard", +- "version": "3.0", +- "board": "openeuler", +- "api_version": 8, +- "enable_ramdisk": false, +- "build_selinux": false, +- "build_seccomp": false, +- "support_jsapi": false, +- "inherit": [], +- "subsystems": [ +- { +- "subsystem": "common", +- "components": [ +- { +- "component": "common" +- } +- ] ++ "product_name": "openeuler", ++ "device_company": "openeuler", ++ "target_os": "linux", ++ "type": "standard", ++ "version": "3.0", ++ "board": "openeuler", ++ "api_version": 8, ++ "enable_ramdisk": false, ++ "build_selinux": false, ++ "build_seccomp": false, ++ "support_jsapi": false, ++ "inherit": [], ++ "subsystems": [ ++ { ++ "subsystem": "common", ++ "components": [ ++ { ++ "component": "common" ++ } ++ ] ++ }, ++ { ++ "subsystem": "commonlibrary", ++ "components": [ ++ { ++ "component": "c_utils", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "hiviewdfx", ++ "components": [ ++ { ++ "component": "hilog_native", ++ "features": [] + }, + { +- "subsystem": "commonlibrary", +- "components": [ +- { +- "component": "c_utils", +- "features": [] +- } +- ] ++ "component": "hiviewdfx_hilog_native", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "notification", ++ "components": [ ++ { ++ "component": "eventhandler", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "startup", ++ "components": [ ++ { ++ "component": "init", ++ "features": [ ++ "enable_ohos_startup_init_feature_ab_partition = false", ++ "enable_ohos_startup_init_feature_loader = false" ++ ] ++ } ++ ] ++ }, ++ { ++ "subsystem": "security", ++ "components": [ ++ { ++ "component": "huks", ++ "features": [] + }, + { +- "subsystem": "hiviewdfx", +- "components": [ +- { +- "component": "hilog_native", +- "features": [] +- }, +- { +- "component": "hiviewdfx_hilog_native", +- "features": [] +- } +- ] ++ "component": "device_auth", ++ "features": [] + }, + { +- "subsystem": "notification", +- "components": [ +- { +- "component": "eventhandler", +- "features": [] +- } +- ] ++ "component": "dataclassification", ++ "features": [] + }, + { +- "subsystem": "startup", +- "components": [ +- { +- "component": "init", +- "features": [ +- "enable_ohos_startup_init_feature_ab_partition = false", +- "enable_ohos_startup_init_feature_loader = false" +- ] +- } +- ] ++ "component": "device_security_level", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "communication", ++ "components": [ ++ { ++ "component": "ipc", ++ "features": [] + }, + { +- "subsystem": "security", +- "components": [ +- { +- "component": "huks", +- "features": [] +- }, +- { +- "component": "device_auth", +- "features": [] +- } +- ] ++ "component": "dsoftbus", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "systemabilitymgr", ++ "components": [ ++ { ++ "component": "safwk", ++ "features": [] + }, + { +- "subsystem": "communication", +- "components": [ +- { +- "component": "ipc", +- "features": [] +- }, +- { +- "component": "dsoftbus", +- "features": [] +- } +- ] ++ "component": "samgr", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "distributedhardware", ++ "components": [ ++ { ++ "component": "device_manager", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "distributeddatamgr", ++ "components": [ ++ { ++ "component": "kv_store", ++ "features": [] ++ }, ++ { ++ "component": "relational_store", ++ "features": [] + }, + { +- "subsystem": "systemabilitymgr", +- "components": [ +- { +- "component": "safwk", +- "features": [] +- }, +- { +- "component": "samgr", +- "features": [] +- } +- ] ++ "component": "datamgr_service", ++ "features": [] + }, + { +- "subsystem": "distributedhardware", +- "components": [ +- { +- "component": "device_manager", +- "features": [] +- } +- ] ++ "component": "data_object", ++ "features": [] ++ } ++ ] ++ }, ++ { ++ "subsystem": "filemanagement", ++ "components": [ ++ { ++ "component": "dfs_service", ++ "features": [] + } +- ] +-} ++ ] ++ } ++ ] ++} +\ No newline at end of file +-- +2.33.0 + diff --git a/0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch b/0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch new file mode 100644 index 0000000000000000000000000000000000000000..991f692642278ed996d52ca3737dd7e62658c08f --- /dev/null +++ b/0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch @@ -0,0 +1,75 @@ +From 05a1c372db8ad7303c67254b975a614bdaa37e0d Mon Sep 17 00:00:00 2001 +From: heppen +Date: Fri, 17 Nov 2023 16:08:48 +0800 +Subject: [PATCH] add build gn file of icu/jsoncpp/zlib + +--- + .../third_party/icu/icu4c/BUILD.gn | 19 +++++++++++++++++++ + .../compiler_gn/third_party/jsoncpp/BUILD.gn | 11 +++++++++++ + .../compiler_gn/third_party/zlib/BUILD.gn | 10 ++++++++++ + 3 files changed, 40 insertions(+) + create mode 100644 openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn + create mode 100644 openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn + create mode 100644 openeuler/compiler_gn/third_party/zlib/BUILD.gn + +diff --git a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn +new file mode 100644 +index 0000000..ac57abf +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn +@@ -0,0 +1,19 @@ ++import("//build/ohos.gni") ++ ++config("icuuc_config"){ ++ include_dirs = [ "/usr/include/unicode" ] ++ libs = [ "icuuc" ] ++} ++ ++group("shared_icuuc") { ++ public_configs = [ ":icuuc_config" ] ++} ++ ++config("icui18n_config"){ ++ include_dirs = [ "/usr/include/unicode" ] ++ libs = [ "icui18n" ] ++} ++ ++ohos_shared_library("shared_icui18n") { ++ public_configs = [ ":icui18n_config" ] ++} +diff --git a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn +new file mode 100644 +index 0000000..2264d70 +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn +@@ -0,0 +1,11 @@ ++import("//build/ohos.gni") ++ ++ ++config("jsoncpp_config") { ++ include_dirs = [ "/usr/include/json" ] ++ libs = ["jsoncpp"] ++} ++ ++group("jsoncpp") { ++ public_configs = [":jsoncpp_config"] ++} +diff --git a/openeuler/compiler_gn/third_party/zlib/BUILD.gn b/openeuler/compiler_gn/third_party/zlib/BUILD.gn +new file mode 100644 +index 0000000..1837ef8 +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/zlib/BUILD.gn +@@ -0,0 +1,10 @@ ++import("//build/ohos.gni") ++ ++config("zlib_config") { ++ include_dirs = [ "/usr/include" ] ++ libs = [ "z" ] ++} ++ ++group("shared_libz") { ++ public_configs = [":zlib_config" ] ++} +-- +2.33.0 + diff --git a/0023-feat-for-embedded-comment-out-sysroot_hash.patch b/0023-feat-for-embedded-comment-out-sysroot_hash.patch new file mode 100644 index 0000000000000000000000000000000000000000..3af06656b28683cea8cbe2f283a04cb30b31da98 --- /dev/null +++ b/0023-feat-for-embedded-comment-out-sysroot_hash.patch @@ -0,0 +1,35 @@ +From 7c6665977db9192e18f8c28ba33e02b4b548b0da Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Mon, 11 Mar 2024 16:01:57 +0800 +Subject: [PATCH] feat for embedded comment out sysroot_hash + +--- + config/posix/BUILD.gn | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/config/posix/BUILD.gn b/config/posix/BUILD.gn +index 53fa7ac..9afcdae 100644 +--- a/config/posix/BUILD.gn ++++ b/config/posix/BUILD.gn +@@ -88,12 +88,12 @@ config("runtime_library") { + # when turning the sysroot on or off. (defines are passed via the command + # line, and build system rebuilds things when their commandline + # changes). Nothing should ever read this define. +- sysroot_hash = +- exec_script("//build/linux/sysroot_scripts/install-sysroot.py", +- [ "--print-hash=$current_cpu" ], +- "trim string", +- [ "//build/linux/sysroot_scripts/sysroots.json" ]) +- defines += [ "CR_SYSROOT_HASH=$sysroot_hash" ] ++ # sysroot_hash = ++ # exec_script("//build/linux/sysroot_scripts/install-sysroot.py", ++ # [ "--print-hash=$current_cpu" ], ++ # "trim string", ++ # [ "//build/linux/sysroot_scripts/sysroots.json" ]) ++ # defines += [ "CR_SYSROOT_HASH=$sysroot_hash" ] + } + asmflags += sysroot_flags + +-- +2.20.1 (Apple Git-117) + diff --git a/0024-feat-for-embedded-add-linux_arm64-toolchain.patch b/0024-feat-for-embedded-add-linux_arm64-toolchain.patch new file mode 100644 index 0000000000000000000000000000000000000000..71d39456d7032234f2df25820e0613963a1d30f7 --- /dev/null +++ b/0024-feat-for-embedded-add-linux_arm64-toolchain.patch @@ -0,0 +1,41 @@ +From ff44eba6593a3e8a3c0c7bcaf7ab913ba2b8e76f Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Tue, 12 Mar 2024 15:04:10 +0800 +Subject: [PATCH] feat for embedded add linux_arm64 toolchain + +--- + toolchain/linux/BUILD.gn | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn +index a8c2f78..9019e67 100644 +--- a/toolchain/linux/BUILD.gn ++++ b/toolchain/linux/BUILD.gn +@@ -147,3 +147,23 @@ clang_toolchain("linux_clang_arm64") { + } + shlib_extension = ".z.so" + } ++ ++gcc_toolchain("linux_arm64") { ++ tool_path = rebase_path("//toolchain/bin", root_build_dir) ++ toolprefix = "${tool_path}/aarch64-openeuler-linux-gnu-" ++ ++ cc = "${toolprefix}gcc" ++ cxx = "${toolprefix}g++" ++ ++ ar = "${toolprefix}ar" ++ ld = cxx ++ readelf = "${toolprefix}readelf" ++ nm = "${toolprefix}nm" ++ ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "linux" ++ is_clang = false ++ } ++ shlib_extension = ".z.so" ++} +\ No newline at end of file +-- +2.20.1 (Apple Git-117) + diff --git a/0025-feat-for-embedded-fix-sysroot-path.patch b/0025-feat-for-embedded-fix-sysroot-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..e6f4d9374239b3e98dc7bda098ab0ec403111793 --- /dev/null +++ b/0025-feat-for-embedded-fix-sysroot-path.patch @@ -0,0 +1,59 @@ +From c14e20a9afa283e454b3e5c209e237c100fbf10d Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Wed, 13 Mar 2024 16:12:51 +0800 +Subject: [PATCH] feat for embedded fix sysroot path + +--- + .../hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn | 7 ++++--- + .../third_party/bounds_checking_function/BUILD.gn | 3 ++- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn +index bd1f91b..776e60a 100644 +--- a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn +@@ -11,9 +11,10 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + import("//build/ohos.gni") ++import("//build/config/sysroot.gni") + + config("libhilog_pub_config") { +- include_dirs = [ "include" ] ++ include_dirs = [ "${sysroot}/usr/include/hilog" ] + libs = ["hilog.z"] + } + +@@ -22,11 +23,11 @@ group("libhilog") { + } + + config("libhilog_base_pub_cfg") { +- include_dirs = [ "include" ] ++ include_dirs = [ "${sysroot}/usr/include/hilog" ] + } + + ohos_prebuilt_static_library("libhilog_base") { +- source = "/usr/lib64/libhilog_base.a" ++ source = "${sysroot}/usr/lib64/libhilog_base.a" + public_configs = [ ":libhilog_base_pub_cfg" ] + + part_name = "hilog_native" +diff --git a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn +index ae44b79..5c17fb7 100644 +--- a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn ++++ b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn +@@ -11,9 +11,10 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + import("//build/ohos.gni") ++import("//build/config/sysroot.gni") + + config("libsec_public_config") { +- include_dirs = [ "include" ] ++ include_dirs = [ "${sysroot}/usr/include" ] + libs = [ "boundscheck" ] + } + +-- +2.20.1 (Apple Git-117) + diff --git a/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch b/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch new file mode 100644 index 0000000000000000000000000000000000000000..1f43f70e020dce14262a36b2ab72a092ca9d7e41 --- /dev/null +++ b/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch @@ -0,0 +1,66 @@ +From 4f8c781a40cae211fa28dec3220509c23f68fd1c Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Fri, 28 Jun 2024 15:19:19 +0800 +Subject: [PATCH] feat for embedded fix jsoncpp icu zlib sysroot + +--- + openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn | 5 +++-- + openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn | 4 ++-- + openeuler/compiler_gn/third_party/zlib/BUILD.gn | 3 ++- + 3 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn +index ac57abf..6fdfc7b 100644 +--- a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn ++++ b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn +@@ -1,7 +1,8 @@ + import("//build/ohos.gni") ++import("//build/config/sysroot.gni") + + config("icuuc_config"){ +- include_dirs = [ "/usr/include/unicode" ] ++ include_dirs = [ "${sysroot}/usr/include/unicode" ] + libs = [ "icuuc" ] + } + +@@ -10,7 +11,7 @@ group("shared_icuuc") { + } + + config("icui18n_config"){ +- include_dirs = [ "/usr/include/unicode" ] ++ include_dirs = [ "${sysroot}/usr/include/unicode" ] + libs = [ "icui18n" ] + } + +diff --git a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn +index 2264d70..5abc48e 100644 +--- a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn ++++ b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn +@@ -1,8 +1,8 @@ + import("//build/ohos.gni") +- ++import("//build/config/sysroot.gni") + + config("jsoncpp_config") { +- include_dirs = [ "/usr/include/json" ] ++ include_dirs = [ "${sysroot}/usr/include/json" ] + libs = ["jsoncpp"] + } + +diff --git a/openeuler/compiler_gn/third_party/zlib/BUILD.gn b/openeuler/compiler_gn/third_party/zlib/BUILD.gn +index 1837ef8..00cb0de 100644 +--- a/openeuler/compiler_gn/third_party/zlib/BUILD.gn ++++ b/openeuler/compiler_gn/third_party/zlib/BUILD.gn +@@ -1,7 +1,8 @@ + import("//build/ohos.gni") ++import("//build/config/sysroot.gni") + + config("zlib_config") { +- include_dirs = [ "/usr/include" ] ++ include_dirs = [ "${sysroot}/usr/include" ] + libs = [ "z" ] + } + +-- +2.45.2.windows.1 + diff --git a/0027-feat-support-gn-upgrade.patch b/0027-feat-support-gn-upgrade.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e4653a7e2fcad60324f981e2af3bc916ffa3046 --- /dev/null +++ b/0027-feat-support-gn-upgrade.patch @@ -0,0 +1,225 @@ +From 4fa15c6cb583d35026ef0e35b3077a458b4d69fb Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Mon, 29 Jul 2024 11:00:02 +0800 +Subject: [PATCH] feat support gn upgrade + +--- + config/BUILDCONFIG.gn | 2 +- + config/ohos/copy_ex.gni | 2 +- + config/python.gni | 17 ++++++++++------- + config/sanitizers/BUILD.gn | 2 +- + ohos/ndk/ndk.gni | 7 ++++--- + ohos/sdk/sdk.gni | 2 +- + templates/cxx/prebuilt.gni | 8 ++++---- + templates/metadata/module_info.gni | 10 ++++++---- + 8 files changed, 28 insertions(+), 22 deletions(-) + +diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn +index 280894e..2229b1c 100644 +--- a/config/BUILDCONFIG.gn ++++ b/config/BUILDCONFIG.gn +@@ -554,7 +554,7 @@ if (!is_ohos) { + sources_assignment_filter += [] + } + +-set_sources_assignment_filter(sources_assignment_filter) ++# set_sources_assignment_filter(sources_assignment_filter) + if (is_standard_system) { + file_exist = exec_script("//build/scripts/check_file_exist.py", + [ "${device_build_path}/config.gni" ], +diff --git a/config/ohos/copy_ex.gni b/config/ohos/copy_ex.gni +index 306c452..ff2396c 100644 +--- a/config/ohos/copy_ex.gni ++++ b/config/ohos/copy_ex.gni +@@ -22,7 +22,7 @@ import("//build/config/python.gni") + # outputs, testonly, visibility. + # + template("copy_ex") { +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + action_with_pydeps(target_name) { + forward_variables_from(invoker, + [ +diff --git a/config/python.gni b/config/python.gni +index 79ddcb5..b59c7c4 100644 +--- a/config/python.gni ++++ b/config/python.gni +@@ -44,8 +44,9 @@ template("python_library") { + _py_files = read_file(invoker.pydeps_file, "list lines") + + # Filter out comments. +- set_sources_assignment_filter([ "#*" ]) ++ # set_sources_assignment_filter([ "#*" ]) + sources = _py_files ++ sources = filter_exclude(sources, [ "#*" ]) + + # Even though the .pydep file is not used at runtime, it must be added + # so that "gn analyze" will mark the target as changed when .py files +@@ -85,10 +86,11 @@ template("action_with_pydeps") { + if (defined(sources)) { + _old_sources = sources + } +- set_sources_assignment_filter([ "#*" ]) +- sources = _pydeps_raw ++ # set_sources_assignment_filter([ "#*" ]) ++ # sources = _pydeps_raw ++ sources = filter_exclude(_pydeps_raw, [ "#*" ]) + _pydeps = sources +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = _old_sources + + action(target_name) { +@@ -130,10 +132,11 @@ template("action_foreach_with_pydeps") { + if (defined(sources)) { + _old_sources = sources + } +- set_sources_assignment_filter([ "#*" ]) +- sources = _pydeps_raw ++ # set_sources_assignment_filter([ "#*" ]) ++ # sources = _pydeps_raw ++ sources = filter_exclude(_pydeps_raw, [ "#*" ]) + _pydeps = sources +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = _old_sources + + action_foreach(target_name) { +diff --git a/config/sanitizers/BUILD.gn b/config/sanitizers/BUILD.gn +index d2f0863..2fa841d 100644 +--- a/config/sanitizers/BUILD.gn ++++ b/config/sanitizers/BUILD.gn +@@ -73,7 +73,7 @@ if ((is_mac || is_win || !use_xcode_clang || is_ohos) && using_sanitizer) { + "$clang_base_path/lib/clang/$clang_version/lib/$_clang_rt_dso_path" + + copy("copy_asan_runtime") { +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [ _clang_rt_dso_full_path ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] + } +diff --git a/ohos/ndk/ndk.gni b/ohos/ndk/ndk.gni +index 58148f0..8533224 100644 +--- a/ohos/ndk/ndk.gni ++++ b/ohos/ndk/ndk.gni +@@ -262,14 +262,15 @@ template("ohos_ndk_copy") { + } + _dest = invoker.dest_dir + +- set_sources_assignment_filter([ "*os-irrelevant*" ]) +- sources = [ _dest ] ++ # set_sources_assignment_filter([ "*os-irrelevant*" ]) ++ # sources = [ _dest ] ++ sources = filter_exclude([ _dest ], [ "*os-irrelevant*" ]) + if (sources == []) { + _notice_rel_dir = ndk_os_irrelevant_out_dir + } else { + _notice_rel_dir = ndk_os_specific_out_dir + } +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [] + + _main_target_name = target_name +diff --git a/ohos/sdk/sdk.gni b/ohos/sdk/sdk.gni +index bc0c851..03a0c7e 100644 +--- a/ohos/sdk/sdk.gni ++++ b/ohos/sdk/sdk.gni +@@ -133,7 +133,7 @@ template("make_sdk_modules") { + _sdk_modules += [ "${_target_label}(${invoker.sdk_toolchain})" ] + } + sources = [] +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + } + not_needed(invoker, [ "sdk_toolchain" ]) + +diff --git a/templates/cxx/prebuilt.gni b/templates/cxx/prebuilt.gni +index 74fe7fc..01f924b 100644 +--- a/templates/cxx/prebuilt.gni ++++ b/templates/cxx/prebuilt.gni +@@ -42,7 +42,7 @@ template("ohos_prebuilt_executable") { + "license_file", + "license_as_sources", + ]) +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [ invoker.source ] + outputs = [ _copy_output ] + module_type = "bin" +@@ -90,7 +90,7 @@ template("ohos_prebuilt_shared_library") { + "license_file", + "license_as_sources", + ]) +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [ invoker.source ] + outputs = [ _copy_output ] + module_type = "lib" +@@ -136,7 +136,7 @@ template("ohos_prebuilt_static_library") { + "license_file", + "license_as_sources", + ]) +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [ invoker.source ] + outputs = [ _copy_output ] + bypass_module_info_generation = true +@@ -176,7 +176,7 @@ template("ohos_prebuilt_etc") { + "license_file", + "license_as_sources", + ]) +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + sources = [ invoker.source ] + outputs = [ _copy_output ] + module_type = "etc" +diff --git a/templates/metadata/module_info.gni b/templates/metadata/module_info.gni +index f4d4e54..412a1ea 100644 +--- a/templates/metadata/module_info.gni ++++ b/templates/metadata/module_info.gni +@@ -223,8 +223,9 @@ template("write_meta_data") { + _parent_invoker = invoker.invoker + _caller_target_name = get_label_info(":${_parent_invoker.target_name}", + "label_no_toolchain") +- set_sources_assignment_filter(app_target_allowlist) ++ # set_sources_assignment_filter(app_target_allowlist) + sources = [ _caller_target_name ] ++ sources = filter_exclude(sources, app_target_allowlist) + if (sources != []) { + if (type == "js_assets" || type == "ets_assets" || + type == "unresolved_assets" || type == "assets") { +@@ -237,7 +238,7 @@ template("write_meta_data") { + "Illegal target name: \"${_caller_target_name}\", target name of ohos_resources must endswith res or resources or resource") + } + } +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + } + + script = "//build/templates/metadata/write_meta_data.py" +@@ -264,18 +265,19 @@ template("write_meta_data") { + + _deps_metadata = [] + inputs = [] +- set_sources_assignment_filter(app_target_allowlist) ++ # set_sources_assignment_filter(app_target_allowlist) + foreach(d, _possible_deps) { + sources = [] + _target_label = get_label_info(d, "label_no_toolchain") + sources += [ _target_label ] ++ sources = filter_exclude(sources, app_target_allowlist) + if (sources == []) { + _deps_metadata += [ get_label_info(d, "target_gen_dir") + "/" + + get_label_info(d, "name") + ".metadata" ] + deps += [ "${_target_label}__metadata" ] + } + } +- set_sources_assignment_filter([]) ++ # set_sources_assignment_filter([]) + + if (_deps_metadata != []) { + args += [ "--deps-metadata" ] +-- +2.45.2.windows.1 + diff --git a/0021-change-clang-compiler-path.patch b/0028-change-clang-compiler-path.patch similarity index 100% rename from 0021-change-clang-compiler-path.patch rename to 0028-change-clang-compiler-path.patch diff --git a/0029-feat-adapt-for-llvm17.patch b/0029-feat-adapt-for-llvm17.patch new file mode 100644 index 0000000000000000000000000000000000000000..99baa8bcb727a76b6f9af5ae5e99e3c934fbf722 --- /dev/null +++ b/0029-feat-adapt-for-llvm17.patch @@ -0,0 +1,29 @@ +From 46c7f9e5780634e091f5bbe399602641e254f438 Mon Sep 17 00:00:00 2001 +From: yykk +Date: Fri, 26 Apr 2024 14:56:38 +0800 +Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DLLVM17=EF=BC=8C=E5=88=A0?= + =?UTF-8?q?=E9=99=A4=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=8F=82=E6=95=B0?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + config/compiler/BUILD.gn | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn +index 0049dc0..6118cc2 100644 +--- a/config/compiler/BUILD.gn ++++ b/config/compiler/BUILD.gn +@@ -734,8 +734,6 @@ config("compiler_cpu_abi") { + } + cflags += [ + "-march=$arm_arch", +- "-mfloat-abi=$arm_float_abi", +- "-mfpu=$arm_fpu", + ] + ldflags += [ "-march=$arm_arch" ] + } +-- +2.38.1.windows.1 + diff --git a/distributed-build.spec b/distributed-build.spec index b91e54d78f3f6491365f0a52549a873dd60a02f1..9c72dcfebb38dada5db6497cc978ee37209bafc6 100644 --- a/distributed-build.spec +++ b/distributed-build.spec @@ -1,13 +1,13 @@ %define debug_package %{nil} %global openHarmony_source_release OpenHarmony-v3.2-Release -Name: distributed-build -Version: 1.0.0 -Release: 7 -Summary: openEuler embedded softbus build tools -License: Apache-2.0 -URL: https://gitee.com/openharmony/build -Requires: ninja-build, gn, clang, llvm, lld, python, python-pyyaml, python-jinja2, distributed-build_lite -SOURCE0: https://gitee.com/openharmony/build/repository/archive/%{openHarmony_source_release}.tar.gz #/build-%{openHarmony_source_release}.tar.gz +Name: distributed-build +Version: 1.0.0 +Release: 12 +Summary: openEuler embedded softbus build tools +License: Apache-2.0 +URL: https://gitee.com/openharmony/build +Requires: ninja-build, gn, clang, llvm, lld, python, python-pyyaml, python-jinja2, distributed-build_lite +Source0: https://gitee.com/openharmony/build/repository/archive/%{openHarmony_source_release}.tar.gz #/build-%{openHarmony_source_release}.tar.gz Patch0001: 0001-feat-Adapt-to-Openeuler-python-export-lld.patch Patch0002: 0002-feat-Adapt-to-Openeuler-for-compilation.patch Patch0003: 0003-feat-Adapt-to-Openeuler-add-clang.patch @@ -17,19 +17,22 @@ Patch0006: 0006-feat-add-base-config.json-for-openeuler.patch Patch0007: 0007-feat-add-gn-files-to-use-packages-on-openeuler.patch Patch0008: 0008-feat-Adapt-to-openeuler.patch Patch0009: 0009-feat-add-common-subsystem-and-delete-useless-config.patch -Patch0010: 0010-feat-use-include-samgr-for-samgr-include-files-confi.patch -Patch0011: 0011-feat-use-.z-for-libs-name.patch Patch0012: 0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch Patch0013: 0013-feature-use-llvm-tools-version-15-for-build.patch Patch0014: 0014-feat-delete-the-default-sqlite-deps.patch Patch0015: 0015-feat-and-hilog-gn-files.patch Patch0016: 0016-fix-use-llvm15-path-on-x86_64.patch Patch0017: 0017-feat-add-script-to-create-soft-link.patch -Patch0018: 0018-feat-add-safwk-compile-gn-target.patch -Patch0019: 0019-feat-add-devicemanager-gn-files.patch -Patch0020: 0020-add-some-components-to-build.patch -Patch0021: 0021-change-clang-compiler-path.patch - +Patch0020: 0020-feat-add-openssl-gn-file-and-soft-link.patch +Patch0021: 0021-feat-change-config-json.patch +Patch0022: 0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch +Patch0023: 0023-feat-for-embedded-comment-out-sysroot_hash.patch +Patch0024: 0024-feat-for-embedded-add-linux_arm64-toolchain.patch +Patch0025: 0025-feat-for-embedded-fix-sysroot-path.patch +Patch0026: 0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch +Patch0027: 0027-feat-support-gn-upgrade.patch +Patch0028: 0028-change-clang-compiler-path.patch +Patch0029: 0029-feat-adapt-for-llvm17.patch BuildArch: noarch %description @@ -49,6 +52,21 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist /opt/distributed-middleware-build %changelog +* Sat Aug 31 2024 yukaii - 1.0.0-12 +- Adapt for LLVM-17, remove invalid compilation parameters + +* Mon Jul 29 2024 s_c_c - 1.0.0-11 +- Remove set_sources_assignment_filter and delete some redundant patchs + +* Thu Jun 27 2024 s_c_c - 1.0.0-10 +- Fix jsoncpp icu and zlib sysroot path for embedded + +* Tue Mar 12 2024 s_c_c - 1.0.0-9 +- Fix sysroot path and add toolchain for embedded + +* Fri Mar 08 2023 Peng He - 1.0.0-8 +- sync from 22.03-LTS-SP3 + * Thu Aug 03 2023 Peng He - 1.0.0-7 - change clang compiler path. diff --git a/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz b/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cc99bcc3d961e08014c5b17400c0c64a7becac27 Binary files /dev/null and b/third_party_sqlite-OpenHarmony-v3.2-Release.tar.gz differ