From 77c1a422732e676859621a64ab9210d5e07ca03d Mon Sep 17 00:00:00 2001
From: haixiangw <wanghaixiang@huawei.com>
Date: Tue, 17 Dec 2024 05:22:25 -0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0feature=E5=BC=80=E5=85=B3cert?=
 =?UTF-8?q?ificate=5Fmanager=5Ffeature=5Fdialog=5Fenabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: haixiangw <wanghaixiang@huawei.com>
---
 BUILD.gn                                | 10 ++++++----
 bundle.json                             |  3 ++-
 cert_manager.gni                        | 20 ++++++++++++++------
 services/cert_manager_standard/BUILD.gn | 13 +++----------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index ea2530c..3448f4f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//base/security/certificate_manager/cert_manager.gni")
+
 group("cert_manager_sdk_test") {
   testonly = true
   if (os_level == "standard") {
@@ -27,10 +29,10 @@ group("cert_manager_sdk_test") {
 group("cert_manager_napi") {
   if (os_level == "standard") {
     if (support_jsapi) {
-      deps = [
-        "./interfaces/kits/napi:certmanager",
-        "./interfaces/kits/napi:certmanagerdialog",
-      ]
+      deps = [ "./interfaces/kits/napi:certmanager" ]
+      if (certificate_manager_feature_dialog_enabled) {
+        deps += [ "./interfaces/kits/napi:certmanagerdialog" ]
+      }
     }
   }
 }
diff --git a/bundle.json b/bundle.json
index cc7cfde..6e65729 100644
--- a/bundle.json
+++ b/bundle.json
@@ -23,7 +23,8 @@
       "features": [
         "certificate_manager_deps_huks_enabled",
         "certificate_manager_feature_ca_enabled",
-        "certificate_manager_feature_credential_enabled"
+        "certificate_manager_feature_credential_enabled",
+        "certificate_manager_feature_dialog_enabled"
       ],
       "adapted_system_type": [
         "mini",
diff --git a/cert_manager.gni b/cert_manager.gni
index b4c913a..55e4df2 100644
--- a/cert_manager.gni
+++ b/cert_manager.gni
@@ -18,18 +18,26 @@ cert_manager_root_dir = "//base/security/certificate_manager"
 declare_args() {
   # depend on the definition of huks security level in base/security/huks/build/config.gni
   certificate_manager_deps_huks_enabled = "software"
+
+  certificate_manager_feature_ca_enabled = true
+
+  certificate_manager_feature_credential_enabled = true
+
+  certificate_manager_feature_dialog_enabled = false
+  if (defined(global_parts_info) &&
+      defined(global_parts_info.arkui_ace_engine)) {
+    certificate_manager_feature_dialog_enabled = true
+  }
 }
 
-if (!defined(global_parts_info) ||
+has_os_account_part = false
+if (defined(global_parts_info) &&
     defined(global_parts_info.account_os_account)) {
   has_os_account_part = true
-} else {
-  has_os_account_part = false
 }
 
-if (!defined(global_parts_info) ||
+support_security_guard = false
+if (defined(global_parts_info) &&
     defined(global_parts_info.security_security_guard)) {
   support_security_guard = true
-} else {
-  support_security_guard = false
 }
diff --git a/services/cert_manager_standard/BUILD.gn b/services/cert_manager_standard/BUILD.gn
index 33dd76f..e83ea88 100644
--- a/services/cert_manager_standard/BUILD.gn
+++ b/services/cert_manager_standard/BUILD.gn
@@ -11,16 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//base/security/certificate_manager/cert_manager.gni")
 import("//build/ohos.gni")
 
-declare_args() {
-  certificate_manager_feature_ca_enabled = "true"
-}
-
-declare_args() {
-  certificate_manager_feature_credential_enabled = "true"
-}
-
 ohos_prebuilt_etc("cert_manager_service.rc") {
   source = "cert_manager_service.cfg"
   relative_install_dir = "init"
@@ -42,10 +35,10 @@ ohos_shared_library("cert_manager_service") {
   part_name = "certificate_manager"
   defines = []
 
-  if (certificate_manager_feature_ca_enabled == "false") {
+  if (!certificate_manager_feature_ca_enabled) {
     defines += [ "CERTIFICATE_MANAGER_FEATURE_CA_DISABLED" ]
   }
-  if (certificate_manager_feature_credential_enabled == "false") {
+  if (!certificate_manager_feature_credential_enabled) {
     defines += [ "CERTIFICATE_MANAGER_FEATURE_CREDENTIAL_DISABLED" ]
   }
 
-- 
Gitee