From 31ade3f03acc2f482fefe3a0fdee6cb89718aa4a Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Sat, 15 Jan 2022 17:02:54 +0800 Subject: [PATCH 1/4] Component standardization Signed-off-by: wangyongzhong2 --- bundle.json | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ohos.build | 40 ------------------------------- 2 files changed, 68 insertions(+), 40 deletions(-) create mode 100755 bundle.json delete mode 100755 ohos.build diff --git a/bundle.json b/bundle.json new file mode 100755 index 0000000..f82315d --- /dev/null +++ b/bundle.json @@ -0,0 +1,68 @@ +{ + "name": "@openharmony/dataclassification", + "version": "3.1.0", + "description": "dataclassification", + "publishAs": "code-segment", + "scripts": { + "install": "DEST_PATH=${DEP_BUNDLE_BASE}/base/security/dataclassification && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" + }, + "author": {}, + "repository": "", + "license": "Apache License 2.0", + "component": { + "name": "dataclassification", + "subsystem": "security", + "adapted_system_type": [ "standard" ], + "deps": { + "components": [ + "dslm_sdk", + "utils_base", + "libhilog" + ] + }, + "build": { + "sub_component": [ + "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", + "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", + "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel" + ], + "inner_kits": [ + { + "name": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", + "header": { + "header_files": [ + "fbe_sdp_code_num.h", + "fbe_sdp_policy.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr/include" + } + }, + { + "name": "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", + "header": { + "header_files": [ + "1.0/dev_slinfo_mgr.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/hwdevsl/include" + } + }, + { + "name": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", + "header": { + "header_files": [ + "dev_slinfo_adpt.h", + "dev_slinfo_log.h", + "dev_slinfo_list.h", + "dev_slinfo_mgr.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include" + } + } + ], + "test": [ + "//base/security/dataclassification/test/unittest/fbe_iudf_xattr:fbe_iudf_xattr_test", + "//base/security/dataclassification/test/unittest/hwdevsl:hwdevsl_test" + ] + } +} +} diff --git a/ohos.build b/ohos.build deleted file mode 100755 index 72dada8..0000000 --- a/ohos.build +++ /dev/null @@ -1,40 +0,0 @@ -{ - "subsystem": "security", - "parts": { - "dataclassification": { - "variants": [ - "phone", - "wearable" - ], - "module_list": [ - "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr" - ], - "inner_kits": [ - { - "name": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", - "header": { - "header_files": [ - "fbe_sdp_code_num.h", - "fbe_sdp_policy.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr/include" - } - }, - { - "name": "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "header": { - "header_files": [ - "1.0/dev_slinfo_mgr.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/hwdevsl/include" - } - } - ], - "test_list": [ - "//base/security/dataclassification/test/unittest/fbe_iudf_xattr:fbe_iudf_xattr_test", - "//base/security/dataclassification/test/unittest/hwdevsl:hwdevsl_test" - ] - } - } -} -- Gitee From 7b83b8837649bdffd3e1256fd81d6654e5138563 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Mon, 17 Jan 2022 15:29:18 +0800 Subject: [PATCH 2/4] update .json Signed-off-by: wangyongzhong2 --- bundle.json | 153 +++++++++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/bundle.json b/bundle.json index f82315d..7e16f94 100755 --- a/bundle.json +++ b/bundle.json @@ -1,68 +1,85 @@ -{ - "name": "@openharmony/dataclassification", - "version": "3.1.0", - "description": "dataclassification", - "publishAs": "code-segment", - "scripts": { - "install": "DEST_PATH=${DEP_BUNDLE_BASE}/base/security/dataclassification && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" - }, - "author": {}, - "repository": "", - "license": "Apache License 2.0", - "component": { - "name": "dataclassification", - "subsystem": "security", - "adapted_system_type": [ "standard" ], - "deps": { - "components": [ - "dslm_sdk", - "utils_base", - "libhilog" - ] - }, - "build": { - "sub_component": [ - "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", - "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel" - ], - "inner_kits": [ - { - "name": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", - "header": { - "header_files": [ - "fbe_sdp_code_num.h", - "fbe_sdp_policy.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr/include" - } - }, - { - "name": "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "header": { - "header_files": [ - "1.0/dev_slinfo_mgr.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/hwdevsl/include" - } - }, - { - "name": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", - "header": { - "header_files": [ - "dev_slinfo_adpt.h", - "dev_slinfo_log.h", - "dev_slinfo_list.h", - "dev_slinfo_mgr.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include" - } - } - ], - "test": [ - "//base/security/dataclassification/test/unittest/fbe_iudf_xattr:fbe_iudf_xattr_test", - "//base/security/dataclassification/test/unittest/hwdevsl:hwdevsl_test" - ] - } -} -} +{ + "name": "@openharmony/dataclassification", + "description": "openharmony's data transmission control", + "version": "3.1.0", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "//base/security/dataclassification" + }, + "dirs": {}, + "scripts": { + "install": "DEST_PATH=${DEP_BUNDLE_BASE}/base/security/dataclassification && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" + }, + "author": {}, + "repository": "", + "component": { + "name": "dataclassification", + "subsystem": "security", + "syscap": [ + "" + ], + "features": [ + "datasecuritylevel_dtc" + ], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [ + "dslm_sdk", + "utils_base", + "libhilog" + ], + "third_party": [ + "" + ] + }, + "build": { + "sub_components": [ + "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", + "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", + "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel" + ], + "inner_kits": [ + { + "name": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", + "header": { + "header_files": [ + "fbe_sdp_code_num.h", + "fbe_sdp_policy.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr/include" + } + }, + { + "name": "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", + "header": { + "header_files": [ + "1.0/dev_slinfo_mgr.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/hwdevsl/include" + } + }, + { + "name": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", + "header": { + "header_files": [ + "dev_slinfo_adpt.h", + "dev_slinfo_log.h", + "dev_slinfo_list.h", + "dev_slinfo_mgr.h" + ], + "header_base": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include" + } + } + ] , + "test": [ + "//base/security/dataclassification/test/unittest/fbe_iudf_xattr:fbe_iudf_xattr_test", + "//base/security/dataclassification/test/unittest/hwdevsl:hwdevsl_test" + ] + } + } +} -- Gitee From fb3edba56d11edaa4e6165f602f293738fd54034 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Tue, 18 Jan 2022 15:56:38 +0800 Subject: [PATCH 3/4] wangyongzhong2 Signed-off-by: wangyongzhong2 --- bundle.json | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/bundle.json b/bundle.json index 7e16f94..f382b63 100755 --- a/bundle.json +++ b/bundle.json @@ -1,18 +1,14 @@ { - "name": "@openharmony/dataclassification", - "description": "openharmony's data transmission control", - "version": "3.1.0", + "name": "@ohos/dataclassification", + "description": "data transmission control", + "version": "3.1", "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "//base/security/dataclassification" + "destPath": "base/security/dataclassification" }, "dirs": {}, - "scripts": { - "install": "DEST_PATH=${DEP_BUNDLE_BASE}/base/security/dataclassification && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" - }, - "author": {}, - "repository": "", + "scripts": {}, "component": { "name": "dataclassification", "subsystem": "security", @@ -20,13 +16,13 @@ "" ], "features": [ - "datasecuritylevel_dtc" + "" ], "adapted_system_type": [ "standard" ], - "rom": "", - "ram": "", + "rom": "30KB", + "ram": "20KB", "deps": { "components": [ "dslm_sdk", @@ -40,8 +36,7 @@ "build": { "sub_components": [ "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr", - "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel" + "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr" ], "inner_kits": [ { @@ -62,20 +57,8 @@ ], "header_base": "//base/security/dataclassification/interfaces/innerkits/hwdevsl/include" } - }, - { - "name": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel:datasecuritylevel", - "header": { - "header_files": [ - "dev_slinfo_adpt.h", - "dev_slinfo_log.h", - "dev_slinfo_list.h", - "dev_slinfo_mgr.h" - ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/datasecuritylevel/include" - } } - ] , + ], "test": [ "//base/security/dataclassification/test/unittest/fbe_iudf_xattr:fbe_iudf_xattr_test", "//base/security/dataclassification/test/unittest/hwdevsl:hwdevsl_test" -- Gitee From 898815c1c378af99988ac994af19afb23d0514e4 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Sat, 22 Jan 2022 15:15:32 +0800 Subject: [PATCH 4/4] update bundle.json Signed-off-by: wangyongzhong2 --- bundle.json | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/bundle.json b/bundle.json index f382b63..0df9d00 100755 --- a/bundle.json +++ b/bundle.json @@ -12,12 +12,8 @@ "component": { "name": "dataclassification", "subsystem": "security", - "syscap": [ - "" - ], - "features": [ - "" - ], + "syscap": [], + "features": [], "adapted_system_type": [ "standard" ], @@ -25,18 +21,14 @@ "ram": "20KB", "deps": { "components": [ - "dslm_sdk", "utils_base", "libhilog" ], - "third_party": [ - "" - ] + "third_party": [] }, "build": { - "sub_components": [ - "//base/security/dataclassification/interfaces/innerkits/hwdevsl:hwdsl", - "//base/security/dataclassification/interfaces/innerkits/fbe_iudf_xattr:fbe_iudf_xattr" + "sub_component": [ + "//base/security/dataclassification:dataclassification_build_module" ], "inner_kits": [ { -- Gitee