diff --git a/0014-feat-delete-the-default-sqlite-deps.patch b/0014-feat-delete-the-default-sqlite-deps.patch new file mode 100644 index 0000000000000000000000000000000000000000..bf0bbb5f867002173cbbecced88db8ab59feae27 --- /dev/null +++ b/0014-feat-delete-the-default-sqlite-deps.patch @@ -0,0 +1,26 @@ +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 + +--- + common/BUILD.gn | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/common/BUILD.gn b/common/BUILD.gn +index 4daf6bd..2a0cfe2 100755 +--- a/common/BUILD.gn ++++ b/common/BUILD.gn +@@ -23,7 +23,8 @@ group("common_packages") { + if (device_name == "hi3516dv300") { + assert(common_feature_verify) + } +- deps = [ "//third_party/sqlite:sqlite" ] ++ #deps = [ "//third_party/sqlite:sqlite" ] ++ deps = [] + + # deps += [ "musl:musl_install" ] + +-- +2.33.0 + diff --git a/0015-feat-and-hilog-gn-files.patch b/0015-feat-and-hilog-gn-files.patch new file mode 100644 index 0000000000000000000000000000000000000000..c3e5840dbaa497962768d4687996745a58a34b3f --- /dev/null +++ b/0015-feat-and-hilog-gn-files.patch @@ -0,0 +1,236 @@ +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 + +--- + .../base/hiviewdfx/hilog/bundle.json | 37 ++++++++++ + .../hiviewdfx/hilog/interfaces/bundle.json | 74 +++++++++++++++++++ + .../hilog/interfaces/native/bundle.json | 37 ++++++++++ + .../interfaces/native/innerkits/BUILD.gn | 34 +++++++++ + .../hilog/interfaces/native/innerkits/include | 1 + + 5 files changed, 183 insertions(+) + create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json + create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json + create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json + create mode 100644 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn + create mode 120000 openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include + +diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json +new file mode 100644 +index 0000000..8bfadc0 +--- /dev/null ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/bundle.json +@@ -0,0 +1,37 @@ ++{ ++ "name": "@ohos/hilog", ++ "description": "Native log interface provided for system", ++ "version": "3.1", ++ "license": "Apache License 2.0", ++ "publishAs": "code-segment", ++ "segment": { ++ "destPath": "base/hiviewdfx/hilog" ++ }, ++ "dirs": {}, ++ "scripts": {}, ++ "component": { ++ "name": "hilog", ++ "subsystem": "hiviewdfx", ++ "syscap": [ ++ "SystemCapability.HiviewDFX.HiLog" ++ ], ++ "adapted_system_type": [ ++ "standard" ++ ], ++ "rom": "188KB", ++ "ram": "2000KB", ++ "deps": { ++ "components": [ ++ "init", ++ "utils_base" ++ ], ++ "third_party": [ ++ "bounds_checking_function", ++ "zlib" ++ ] ++ }, ++ "build": { ++ "sub_component": [] ++ } ++ } ++} +diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json +new file mode 100644 +index 0000000..11eee3f +--- /dev/null ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/bundle.json +@@ -0,0 +1,74 @@ ++{ ++ "name": "@ohos/hilog_native", ++ "description": "Native log interface provided for system", ++ "version": "3.1", ++ "license": "Apache License 2.0", ++ "publishAs": "code-segment", ++ "segment": { ++ "destPath": "base/hiviewdfx/hilog" ++ }, ++ "dirs": {}, ++ "scripts": {}, ++ "component": { ++ "name": "hilog_native", ++ "subsystem": "hiviewdfx", ++ "syscap": [ ++ "SystemCapability.HiviewDFX.HiLog" ++ ], ++ "adapted_system_type": [ ++ "standard" ++ ], ++ "rom": "188KB", ++ "ram": "2000KB", ++ "deps": { ++ "components": [ ++ "c_utils", ++ "init", ++ "napi" ++ ], ++ "third_party": [ ++ "bounds_checking_function", ++ "zlib" ++ ] ++ }, ++ "features": [ ++ "hilog_native_feature_ohcore" ++ ], ++ "build": { ++ "group_type": { ++ "base_group": [ ++ ++ ], ++ "fwk_group": [], ++ "service_group": [ ++ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_base", ++ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog" ++ ] ++ }, ++ "inner_kits": [ ++ { ++ "name": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", ++ "header": { ++ "header_files": [ ++ "hilog/log.h", ++ "hilog/log_c.h", ++ "hilog/log_cpp.h", ++ "hilog_trace.h" ++ ], ++ "header_base": "//base/hiviewdfx/hilog/interfaces/native/innerkits/include" ++ } ++ }, ++ { ++ "name": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_base", ++ "header": { ++ "header_files": [ ++ "hilog_base/log_base.h" ++ ], ++ "header_base": "//base/hiviewdfx/hilog/interfaces/native/innerkits/include" ++ } ++ } ++ ], ++ "test": [] ++ } ++ } ++} +diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json +new file mode 100644 +index 0000000..d9e1950 +--- /dev/null ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/bundle.json +@@ -0,0 +1,37 @@ ++{ ++ "name": "@ohos/hiviewdfx_hilog_native", ++ "description": "Native log interface provided for system", ++ "version": "3.1", ++ "license": "Apache License 2.0", ++ "publishAs": "code-segment", ++ "segment": { ++ "destPath": "base/hiviewdfx/hilog" ++ }, ++ "dirs": {}, ++ "scripts": {}, ++ "component": { ++ "name": "hiviewdfx_hilog_native", ++ "subsystem": "hiviewdfx", ++ "syscap": [ ++ "SystemCapability.HiviewDFX.HiLog" ++ ], ++ "adapted_system_type": [ ++ "standard" ++ ], ++ "rom": "188KB", ++ "ram": "2000KB", ++ "deps": { ++ "components": [ ++ "init", ++ "utils_base" ++ ], ++ "third_party": [ ++ "bounds_checking_function", ++ "zlib" ++ ] ++ }, ++ "build": { ++ "sub_component": [] ++ } ++ } ++} +\ No newline at end of file +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 +new file mode 100644 +index 0000000..bd1f91b +--- /dev/null ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn +@@ -0,0 +1,34 @@ ++# 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("libhilog_pub_config") { ++ include_dirs = [ "include" ] ++ libs = ["hilog.z"] ++} ++ ++group("libhilog") { ++ public_configs = [ ":libhilog_pub_config" ] ++} ++ ++config("libhilog_base_pub_cfg") { ++ include_dirs = [ "include" ] ++} ++ ++ohos_prebuilt_static_library("libhilog_base") { ++ source = "/usr/lib64/libhilog_base.a" ++ public_configs = [ ":libhilog_base_pub_cfg" ] ++ ++ part_name = "hilog_native" ++ subsystem_name = "hiviewdfx" ++} +diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include +new file mode 120000 +index 0000000..50b90d9 +--- /dev/null ++++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/include +@@ -0,0 +1 @@ ++/usr/include/hilog/ +\ No newline at end of file +-- +2.33.0 + diff --git a/0016-fix-use-llvm15-path-on-x86_64.patch b/0016-fix-use-llvm15-path-on-x86_64.patch new file mode 100644 index 0000000000000000000000000000000000000000..2b2d7c49686961b1992a755d618f049c81287463 --- /dev/null +++ b/0016-fix-use-llvm15-path-on-x86_64.patch @@ -0,0 +1,24 @@ +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 + +--- + toolchain/linux/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn +index 353b13d..a8c2f78 100755 +--- a/toolchain/linux/BUILD.gn ++++ b/toolchain/linux/BUILD.gn +@@ -121,7 +121,6 @@ clang_toolchain("linux_clang_x86_64") { + # Output linker map files for binary size analysis. + enable_linker_map = true + toolprefix = "/usr/bin/" +- strip = "/usr/bin/llvm-strip" + toolchain_args = { + current_cpu = "x64" + current_os = "linux" +-- +2.33.0 + diff --git a/0017-feat-add-script-to-create-soft-link.patch b/0017-feat-add-script-to-create-soft-link.patch new file mode 100644 index 0000000000000000000000000000000000000000..aadbb4713d829627ddb311d2d46e5e0d5d040d43 --- /dev/null +++ b/0017-feat-add-script-to-create-soft-link.patch @@ -0,0 +1,65 @@ +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 + +--- + openeuler/script/link.py | 46 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + create mode 100755 openeuler/script/link.py + +diff --git a/openeuler/script/link.py b/openeuler/script/link.py +new file mode 100755 +index 0000000..585123e +--- /dev/null ++++ b/openeuler/script/link.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python ++# -*- coding: utf-8 -*- ++# Copyright (c) 2021 Hoperun 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 os ++import sys ++import argparse ++ ++# create parent directory ++def create_dir(dir): ++ dir_items = dir.split("/") ++ full_name = "" ++ length = len(dir_items) - 1 ++ for i in range(length): ++ full_name += "/" + dir_items[i] ++ if not os.path.exists(full_name): ++ os.mkdir(full_name) ++ ++def main(): ++ parser = argparse.ArgumentParser() ++ parser.add_argument('--src_target', required=True) ++ parser.add_argument('--dest_target', required=True) ++ args = parser.parse_args() ++ ++ src_target = args.src_target ++ dest_target = args.dest_target ++ ++ if os.path.exists(dest_target): ++ os.unlink(dest_target) ++ create_dir(dest_target) ++ return os.symlink(src_target, dest_target) ++ ++if __name__ == '__main__': ++ sys.exit(main()) ++ +-- +2.33.0 + diff --git a/0018-feat-add-safwk-compile-gn-target.patch b/0018-feat-add-safwk-compile-gn-target.patch new file mode 100644 index 0000000000000000000000000000000000000000..c0a1bbe6e20a7434f04d0ea273e7d8d2a3072544 --- /dev/null +++ b/0018-feat-add-safwk-compile-gn-target.patch @@ -0,0 +1,158 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..d0e74d564374812cfa0ebef459a913edc654b55e --- /dev/null +++ b/0019-feat-add-devicemanager-gn-files.patch @@ -0,0 +1,171 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..f34814d630c13a417ed8fb8fe1255497b30193e6 --- /dev/null +++ b/0020-add-some-components-to-build.patch @@ -0,0 +1,1426 @@ +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/distributed-build.spec b/distributed-build.spec index a7dd4d0c88248bcb61e132bdf332a5adcf1fa7a0..90909bd215a347d4f99e14208531898ae8f448a9 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: 1 -Summary: openEuler embedded softbus build tools -License: Apache-2.0 -URL: https://gitee.com/openharmony/build -Requires: ninja-build, gn, clang15, llvm15, lld15, 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: 5 +Summary: openEuler embedded softbus build tools +License: Apache-2.0 +URL: https://gitee.com/openharmony/build +Requires: ninja-build, gn, clang15, llvm15, lld15, 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 @@ -21,6 +21,13 @@ 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 BuildArch: noarch @@ -41,5 +48,17 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist /opt/distributed-middleware-build %changelog +* Tue Jun 20 2023 Peng He - 1.0.0-5 +- add some components to build. + +* Fri Jun 16 2023 tianhang - 1.0.0-4 +- add gn files and add tools for soft link files + +* Thu Jun 15 2023 tianhang - 1.0.0-3 +- use llvm15 path for strip on x86_64 + +* Thu Jun 15 2023 tianhang - 1.0.0-2 +- add hilog compile gn files and remove default sqlite deps + * Tue May 30 2023 tianhang - 1.0.0-1 - Init and Adapt to Openeuler