From 320a6b9e33368469dad1aaec3ebd245d5996733b Mon Sep 17 00:00:00 2001 From: im-chenchen Date: Mon, 29 Apr 2024 14:33:39 +0800 Subject: [PATCH 1/4] update bundle.json and build.gn Signed-off-by: im-chenchen --- bundle.json | 2 +- interfaces/innerkits/datatransmitmgr/BUILD.gn | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index ad06e23..d00cd50 100644 --- a/bundle.json +++ b/bundle.json @@ -16,7 +16,7 @@ "SystemCapability.Security.DataTransitManager" ], "features": [ - "dataclassification_datatransmitmgr" + "dataclassification_feature_enabled" ], "adapted_system_type": [ "standard" diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index 98cfadb..41103c5 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -20,6 +20,14 @@ config("datatransmitmgr_config") { include_dirs = [ "include" ] } +declare_args() { + dataclassification_feature_enabled = true + if (defined(global_parts_info) && + !defined(global_parts_info.commonlibrary_c_utils)) { + dataclassification_feature_enabled = false + } +} + ohos_shared_library("data_transit_mgr") { subsystem_name = "security" part_name = "dataclassification" @@ -45,9 +53,10 @@ ohos_shared_library("data_transit_mgr") { stack_protector_ret = true } } - + if (dataclassification_feature_enabled) { + external_deps = ["c_utils:utils"] + } external_deps = [ - "c_utils:utils", "device_security_level:dslm_sdk", "hilog:libhilog", ] -- Gitee From f7d8b9a05fd94bc12aa9d9961f90e0be1e371f57 Mon Sep 17 00:00:00 2001 From: im-chenchen Date: Mon, 29 Apr 2024 14:40:11 +0800 Subject: [PATCH 2/4] update Signed-off-by: im-chenchen --- interfaces/innerkits/datatransmitmgr/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index 41103c5..ce04619 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -56,7 +56,7 @@ ohos_shared_library("data_transit_mgr") { if (dataclassification_feature_enabled) { external_deps = ["c_utils:utils"] } - external_deps = [ + external_deps += [ "device_security_level:dslm_sdk", "hilog:libhilog", ] -- Gitee From d2946ae4bd2fc82bad9a7cc27857b5599e67277d Mon Sep 17 00:00:00 2001 From: im-chenchen Date: Mon, 29 Apr 2024 16:09:35 +0800 Subject: [PATCH 3/4] update external_deps Signed-off-by: im-chenchen --- interfaces/innerkits/datatransmitmgr/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index ce04619..9781e44 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -54,7 +54,7 @@ ohos_shared_library("data_transit_mgr") { } } if (dataclassification_feature_enabled) { - external_deps = ["c_utils:utils"] + external_deps = [ "c_utils:utils" ] } external_deps += [ "device_security_level:dslm_sdk", -- Gitee From 409f14b124560a226ccbd50a82eaf3bb89afd035 Mon Sep 17 00:00:00 2001 From: im-chenchen Date: Tue, 30 Apr 2024 11:08:55 +0800 Subject: [PATCH 4/4] update build.gn Signed-off-by: im-chenchen --- interfaces/innerkits/datatransmitmgr/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index 9781e44..e380aca 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2022-2024 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 -- Gitee