From f247add35a6058cd1902c78256cbb4748fb4a4fe Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 9 Feb 2022 16:46:19 +0800 Subject: [PATCH 1/2] update part name Signed-off-by: wangyongzhong2 --- BUILD.gn | 2 +- bundle.json | 10 ++++++---- .../dev_slinfo_adpt.c | 0 .../dev_slinfo_list.c | 0 .../dev_slinfo_mgr.c | 0 .../{datasecuritylevel => datatransmitmgr}/BUILD.gn | 12 ++++++------ .../include/dev_slinfo_adpt.h | 0 .../include/dev_slinfo_list.h | 0 .../include/dev_slinfo_log.h | 0 .../include/dev_slinfo_mgr.h | 0 .../{datasecuritylevel => datatransmitmgr}/BUILD.gn | 8 ++++---- .../DevSLMgrTest.cpp | 0 .../DevSLMgrTest.h | 0 13 files changed, 17 insertions(+), 15 deletions(-) rename frameworks/{datasecuritylevel => datatransmitmgr}/dev_slinfo_adpt.c (100%) rename frameworks/{datasecuritylevel => datatransmitmgr}/dev_slinfo_list.c (100%) rename frameworks/{datasecuritylevel => datatransmitmgr}/dev_slinfo_mgr.c (100%) rename interfaces/innerkits/{datasecuritylevel => datatransmitmgr}/BUILD.gn (71%) rename interfaces/innerkits/{datasecuritylevel => datatransmitmgr}/include/dev_slinfo_adpt.h (100%) rename interfaces/innerkits/{datasecuritylevel => datatransmitmgr}/include/dev_slinfo_list.h (100%) rename interfaces/innerkits/{datasecuritylevel => datatransmitmgr}/include/dev_slinfo_log.h (100%) rename interfaces/innerkits/{datasecuritylevel => datatransmitmgr}/include/dev_slinfo_mgr.h (100%) rename test/unittest/{datasecuritylevel => datatransmitmgr}/BUILD.gn (85%) rename test/unittest/{datasecuritylevel => datatransmitmgr}/DevSLMgrTest.cpp (100%) rename test/unittest/{datasecuritylevel => datatransmitmgr}/DevSLMgrTest.h (100%) diff --git a/BUILD.gn b/BUILD.gn index 1664932..5082f8b 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,5 +13,5 @@ import("//build/ohos.gni") group("dataclassification_build_module") { - deps = [ "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel" ] + deps = [ "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] } diff --git a/bundle.json b/bundle.json index 201fabc..0d72e8a 100755 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,9 @@ "name": "dataclassification", "subsystem": "security", "syscap": [], - "features": [], + "features": [ + "dataclassification_datatransmitmgr" + ], "adapted_system_type": [ "standard" ], @@ -33,17 +35,17 @@ ], "inner_kits": [ { - "name": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", + "name": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr", "header": { "header_files": [ "dev_slinfo_mgr.h" ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include" + "header_base": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include" } } ], "test": [ - "//base/security/dataclassification/test/unittest/datasecuritylevel:DevSLMgrTest" + "//base/security/dataclassification/test/unittest/datatransmitmgr:DevSLMgrTest" ] } } diff --git a/frameworks/datasecuritylevel/dev_slinfo_adpt.c b/frameworks/datatransmitmgr/dev_slinfo_adpt.c similarity index 100% rename from frameworks/datasecuritylevel/dev_slinfo_adpt.c rename to frameworks/datatransmitmgr/dev_slinfo_adpt.c diff --git a/frameworks/datasecuritylevel/dev_slinfo_list.c b/frameworks/datatransmitmgr/dev_slinfo_list.c similarity index 100% rename from frameworks/datasecuritylevel/dev_slinfo_list.c rename to frameworks/datatransmitmgr/dev_slinfo_list.c diff --git a/frameworks/datasecuritylevel/dev_slinfo_mgr.c b/frameworks/datatransmitmgr/dev_slinfo_mgr.c similarity index 100% rename from frameworks/datasecuritylevel/dev_slinfo_mgr.c rename to frameworks/datatransmitmgr/dev_slinfo_mgr.c diff --git a/interfaces/innerkits/datasecuritylevel/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn similarity index 71% rename from interfaces/innerkits/datasecuritylevel/BUILD.gn rename to interfaces/innerkits/datatransmitmgr/BUILD.gn index 0d7bae7..91a30b5 100644 --- a/interfaces/innerkits/datasecuritylevel/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -16,24 +16,24 @@ import("//build/ohos.gni") ################################################################ # C, Main source file here. ################################################################ -config("datasecuritylevel_config") { +config("datatransmitmgr_config") { include_dirs = [ "include" ] } -ohos_shared_library("datasecuritylevel") { +ohos_shared_library("data_transit_mgr") { subsystem_name = "security" part_name = "dataclassification" - public_configs = [ ":datasecuritylevel_config" ] + public_configs = [ ":datatransmitmgr_config" ] include_dirs = [ "include", ] sources = [ - "//base/security/dataclassification/frameworks/datasecuritylevel/dev_slinfo_mgr.c", - "//base/security/dataclassification/frameworks/datasecuritylevel/dev_slinfo_list.c", - "//base/security/dataclassification/frameworks/datasecuritylevel/dev_slinfo_adpt.c", + "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_mgr.c", + "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_list.c", + "//base/security/dataclassification/frameworks/datatransmitmgr/dev_slinfo_adpt.c", ] deps = [ diff --git a/interfaces/innerkits/datasecuritylevel/include/dev_slinfo_adpt.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h similarity index 100% rename from interfaces/innerkits/datasecuritylevel/include/dev_slinfo_adpt.h rename to interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h diff --git a/interfaces/innerkits/datasecuritylevel/include/dev_slinfo_list.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_list.h similarity index 100% rename from interfaces/innerkits/datasecuritylevel/include/dev_slinfo_list.h rename to interfaces/innerkits/datatransmitmgr/include/dev_slinfo_list.h diff --git a/interfaces/innerkits/datasecuritylevel/include/dev_slinfo_log.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h similarity index 100% rename from interfaces/innerkits/datasecuritylevel/include/dev_slinfo_log.h rename to interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h diff --git a/interfaces/innerkits/datasecuritylevel/include/dev_slinfo_mgr.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_mgr.h similarity index 100% rename from interfaces/innerkits/datasecuritylevel/include/dev_slinfo_mgr.h rename to interfaces/innerkits/datatransmitmgr/include/dev_slinfo_mgr.h diff --git a/test/unittest/datasecuritylevel/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn similarity index 85% rename from test/unittest/datasecuritylevel/BUILD.gn rename to test/unittest/datatransmitmgr/BUILD.gn index ca71371..8e52ab8 100644 --- a/test/unittest/datasecuritylevel/BUILD.gn +++ b/test/unittest/datatransmitmgr/BUILD.gn @@ -14,11 +14,11 @@ import("//build/test.gni") module_output_path = "dataclassification/datasecuritylevel" -config("datasecuritylevel_test_config") { +config("datatransmitmgr_test_config") { visibility = [ ":*" ] include_dirs = [ - "//base/security/dataclassification/test/unittest/datasecuritylevel", - "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include", + "//base/security/dataclassification/test/unittest/datatransmitmgr", + "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include", "//third_party/googletest/googletest/include", "//utils/native/base/include", ] @@ -33,7 +33,7 @@ ohos_unittest("DevSLMgrTest") { sources = [ "DevSLMgrTest.cpp" ] deps = [ - "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", + "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr", "//utils/native/base:utils", ] external_deps = [ diff --git a/test/unittest/datasecuritylevel/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp similarity index 100% rename from test/unittest/datasecuritylevel/DevSLMgrTest.cpp rename to test/unittest/datatransmitmgr/DevSLMgrTest.cpp diff --git a/test/unittest/datasecuritylevel/DevSLMgrTest.h b/test/unittest/datatransmitmgr/DevSLMgrTest.h similarity index 100% rename from test/unittest/datasecuritylevel/DevSLMgrTest.h rename to test/unittest/datatransmitmgr/DevSLMgrTest.h -- Gitee From c8797ef9a5c171e766b8d7ff6416c759bdaccebf Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 9 Feb 2022 16:49:24 +0800 Subject: [PATCH 2/2] update part name Signed-off-by: wangyongzhong2 --- README_zh.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README_zh.md b/README_zh.md index 6b64ecb..20ce090 100644 --- a/README_zh.md +++ b/README_zh.md @@ -29,13 +29,13 @@ ``` base/security/dataclassification ├── frameworks -│ └── datasecuritylevel # 代码实现 +│ └── datatransmitmgr # 代码实现 ├── interfaces # 接口API代码 │ └── innerkits -│ └── datasecuritylevel +│ └── datatransmitmgr └── text #测试代码 └── unittest - └── datasecuritylevel + └── datatransmitmgr ``` @@ -66,7 +66,7 @@ base/security/dataclassification 1、编译依赖添加 ``` -external_deps += [ "dataclassification:datasecuritylevel" ] +external_deps += [ "datatransmitmgr:data_transit_mgr" ] ``` 2、头文件添加 -- Gitee