From e3e45843e356fb7745e09c8107f21c5451b550f6 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Tue, 5 Sep 2023 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=A7=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E9=83=A8=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: y1585740638 Change-Id: I3a4cabd992a69fc4b67f3b45539e4e44cfc06fe9 --- README_zh.md | 2 +- bundle.json | 38 +++++++++---------- config/BUILD.gn | 4 +- frameworks/BUILD.gn | 4 +- interfaces/inner_api/enhance_kits/BUILD.gn | 2 +- .../inner_api/enhance_kits/test/BUILD.gn | 2 +- .../inner_api/security_component/BUILD.gn | 2 +- .../security_component/test/BUILD.gn | 4 +- security_component.gni | 2 +- .../security_component_service/sa/BUILD.gn | 4 +- .../sa/sa_profile/BUILD.gn | 2 +- .../sa/test/BUILD.gn | 4 +- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README_zh.md b/README_zh.md index daba571..fb48b16 100644 --- a/README_zh.md +++ b/README_zh.md @@ -26,7 +26,7 @@ ## 目录 ``` -/base/security/security_component +/base/security/security_component_manager ├── frameworks # 框架层，基础功能代码存放目录 │ ├── common # 框架公共代码存放目录 │ ├── enhance_adapter # 能力增强适配代码存放目录 diff --git a/bundle.json b/bundle.json index 0d2b697..17bb881 100644 --- a/bundle.json +++ b/bundle.json @@ -1,22 +1,22 @@ { - "name": "@openharmony/security_component", - "description": "security_component", + "name": "@openharmony/security_component_manager", + "description": "security_component_manager", "version": "4.0.0", "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "base/security/security_component" + "destPath": "base/security/security_component_manager" }, "dirs": {}, "scripts": {}, "component": { - "name": "security_component", + "name": "security_component_manager", "subsystem": "security", "syscap": [], "hisysevent_config": [ - "//base/security/security_component/hisysevent.yaml" + "//base/security/security_component_manager/hisysevent.yaml" ], - "features": [ "security_component_feature_coverage = false" ], + "features": [ "security_component_manager_feature_coverage = false" ], "adapted_system_type": [ "standard" ], @@ -44,61 +44,61 @@ }, "build": { "sub_component": [ - "//base/security/security_component:security_component_build_module" + "//base/security/security_component_manager:security_component_build_module" ], "inner_kits": [ { - "name": "//base/security/security_component/interfaces/inner_api/security_component:libsecurity_component_sdk", + "name": "//base/security/security_component_manager/interfaces/inner_api/security_component:libsecurity_component_sdk", "header": { "header_files": [ "i_sec_comp_probe.h", "sec_comp_kit.h" ], - "header_base": "//base/security/security_component/interfaces/inner_api/security_component/include" + "header_base": "//base/security/security_component_manager/interfaces/inner_api/security_component/include" } }, { - "name": "//base/security/security_component/interfaces/inner_api/enhance_kits:libsecurity_component_enhance_sdk", + "name": "//base/security/security_component_manager/interfaces/inner_api/enhance_kits:libsecurity_component_enhance_sdk", "header": { "header_files": [ "sec_comp_enhance_kit.h" ], - "header_base": "//base/security/security_component/interfaces/inner_api/enhance_kits/include" + "header_base": "//base/security/security_component_manager/interfaces/inner_api/enhance_kits/include" } }, { - "name": "//base/security/security_component/frameworks:libsecurity_component_framework", + "name": "//base/security/security_component_manager/frameworks:libsecurity_component_framework", "header": { "header_files": [ "location_button.h", "paste_button.h", "save_button.h" ], - "header_base": "//base/security/security_component/interfaces/inner_api/security_component/include" + "header_base": "//base/security/security_component_manager/interfaces/inner_api/security_component/include" } }, { - "name": "//base/security/security_component/frameworks:libsecurity_component_enhance_adapter", + "name": "//base/security/security_component_manager/frameworks:libsecurity_component_enhance_adapter", "header": { "header_files": [ "sec_comp_enhance_adapter.h" ], - "header_base": "//base/security/security_component/frameworks/enhance_adapter/include" + "header_base": "//base/security/security_component_manager/frameworks/enhance_adapter/include" } }, { - "name": "//base/security/security_component/services/security_component_service/sa:security_component_service", + "name": "//base/security/security_component_manager/services/security_component_service/sa:security_component_service", "header": { "header_files": [ "sec_comp_manager.h" ], - "header_base": "//base/security/security_component/services/security_component_service/sa/sa_main" + "header_base": "//base/security/security_component_manager/services/security_component_service/sa/sa_main" } } ], "test": [ - "//base/security/security_component:security_component_build_module_test", - "//base/security/security_component:security_component_build_fuzz_test" + "//base/security/security_component_manager:security_component_build_module_test", + "//base/security/security_component_manager:security_component_build_fuzz_test" ] } } diff --git a/config/BUILD.gn b/config/BUILD.gn index 9cf7554..22f6c54 100644 --- a/config/BUILD.gn +++ b/config/BUILD.gn @@ -12,11 +12,11 @@ # limitations under the License. declare_args() { - security_component_feature_coverage = false + security_component_manager_feature_coverage = false } config("coverage_flags") { - if (security_component_feature_coverage) { + if (security_component_manager_feature_coverage) { cflags = [ "--coverage" ] ldflags = [ "--coverage" ] } diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index c0647d2..35c51f3 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -24,7 +24,7 @@ config("libsecurity_component_framework_config") { ohos_shared_library("libsecurity_component_framework") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" output_name = "libsecurity_component_framework" include_dirs = [ @@ -65,7 +65,7 @@ config("libsecurity_component_enhance_adapter_config") { ohos_shared_library("libsecurity_component_enhance_adapter") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" output_name = "libsecurity_component_enhance_adapter" include_dirs = [ diff --git a/interfaces/inner_api/enhance_kits/BUILD.gn b/interfaces/inner_api/enhance_kits/BUILD.gn index 4acbcce..3cbc21f 100644 --- a/interfaces/inner_api/enhance_kits/BUILD.gn +++ b/interfaces/inner_api/enhance_kits/BUILD.gn @@ -26,7 +26,7 @@ config("sec_comp_enhance_config") { ohos_shared_library("libsecurity_component_enhance_sdk") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" output_name = "libsecurity_component_enhance_sdk" public_configs = [ ":sec_comp_enhance_config" ] diff --git a/interfaces/inner_api/enhance_kits/test/BUILD.gn b/interfaces/inner_api/enhance_kits/test/BUILD.gn index bf1409c..8f1c4f1 100644 --- a/interfaces/inner_api/enhance_kits/test/BUILD.gn +++ b/interfaces/inner_api/enhance_kits/test/BUILD.gn @@ -17,7 +17,7 @@ sec_comp_root_dir = "../../../.." ohos_unittest("sec_comp_enhance_sdk_test") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" module_out_path = part_name + "/" + part_name include_dirs = [ "unittest/src" ] diff --git a/interfaces/inner_api/security_component/BUILD.gn b/interfaces/inner_api/security_component/BUILD.gn index 117f24a..41cef61 100644 --- a/interfaces/inner_api/security_component/BUILD.gn +++ b/interfaces/inner_api/security_component/BUILD.gn @@ -26,7 +26,7 @@ config("sec_comp_config") { ohos_shared_library("libsecurity_component_sdk") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" output_name = "libsecurity_component_sdk" public_configs = [ ":sec_comp_config" ] diff --git a/interfaces/inner_api/security_component/test/BUILD.gn b/interfaces/inner_api/security_component/test/BUILD.gn index 66892b6..c7363f6 100644 --- a/interfaces/inner_api/security_component/test/BUILD.gn +++ b/interfaces/inner_api/security_component/test/BUILD.gn @@ -18,7 +18,7 @@ sec_comp_root_dir = "../../../.." ohos_unittest("sec_comp_sdk_test") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" module_out_path = part_name + "/" + part_name include_dirs = [ @@ -57,7 +57,7 @@ ohos_unittest("sec_comp_sdk_test") { ohos_unittest("sec_comp_register_callback_test") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" module_out_path = part_name + "/" + part_name include_dirs = [ diff --git a/security_component.gni b/security_component.gni index 9d13f50..c8d6f9a 100644 --- a/security_component.gni +++ b/security_component.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -sec_comp_dir = "//base/security/security_component" +sec_comp_dir = "//base/security/security_component_manager" if (!defined(global_parts_info) || defined(global_parts_info.security_security_component_enhance)) { diff --git a/services/security_component_service/sa/BUILD.gn b/services/security_component_service/sa/BUILD.gn index 4cc4ace..2d8a975 100644 --- a/services/security_component_service/sa/BUILD.gn +++ b/services/security_component_service/sa/BUILD.gn @@ -29,12 +29,12 @@ ohos_prebuilt_etc("security_component_service.rc") { source = "security_component_service.cfg" relative_install_dir = "init" subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" } ohos_shared_library("security_component_service") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" include_dirs = [ "sa_main", diff --git a/services/security_component_service/sa/sa_profile/BUILD.gn b/services/security_component_service/sa/sa_profile/BUILD.gn index dc0c6d9..6680406 100644 --- a/services/security_component_service/sa/sa_profile/BUILD.gn +++ b/services/security_component_service/sa/sa_profile/BUILD.gn @@ -15,5 +15,5 @@ import("//build/ohos/sa_profile/sa_profile.gni") ohos_sa_profile("security_component_sa_profile_standard") { sources = [ "3506.json" ] - part_name = "security_component" + part_name = "security_component_manager" } diff --git a/services/security_component_service/sa/test/BUILD.gn b/services/security_component_service/sa/test/BUILD.gn index 2759299..203ef7c 100644 --- a/services/security_component_service/sa/test/BUILD.gn +++ b/services/security_component_service/sa/test/BUILD.gn @@ -18,7 +18,7 @@ sec_comp_root_dir = "../../../.." ohos_unittest("sec_comp_service_test") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" module_out_path = part_name + "/" + part_name include_dirs = [ @@ -87,7 +87,7 @@ ohos_unittest("sec_comp_service_test") { ohos_unittest("sec_comp_service_mock_test") { subsystem_name = "security" - part_name = "security_component" + part_name = "security_component_manager" module_out_path = part_name + "/" + part_name include_dirs = [ -- Gitee