From 9b9ecc5a602cc83ab36f8a464ac53a920b7d45af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=9D=99?= <wangjing561@huawei.com>
Date: Thu, 24 Oct 2024 16:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 王静 <wangjing561@huawei.com>
---
 common/BUILD.gn                    |  4 ++--
 frameworks/BUILD.gn                | 12 ++++++------
 frameworks/js/napi/crypto/BUILD.gn |  5 ++---
 plugin/BUILD.gn                    | 18 +++++++++---------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/common/BUILD.gn b/common/BUILD.gn
index 98419d9..de4d0c3 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -47,13 +47,13 @@ if (os_level == "standard") {
     subsystem_name = "security"
     part_name = "crypto_framework"
     include_dirs = crypto_framwork_common_inc_path
-    include_dirs +=
-        [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ]
 
     sources = crypto_framwork_common_files_lite
 
     defines = [ "MINI_HILOG_ENABLE" ]
 
     configs = [ "${product_path}:product_public_configs" ]
+
+    external_deps = [ "hilog_lite:hilog_lite" ]
   }
 }
diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn
index a210e51..81c9119 100644
--- a/frameworks/BUILD.gn
+++ b/frameworks/BUILD.gn
@@ -17,10 +17,10 @@ import("//build/ohos.gni")
 
 config("framework_config") {
   include_dirs = [
-    "//base/security/crypto_framework/interfaces/inner_api/algorithm_parameter",
-    "//base/security/crypto_framework/interfaces/inner_api/common",
-    "//base/security/crypto_framework/interfaces/inner_api/crypto_operation",
-    "//base/security/crypto_framework/interfaces/inner_api/key",
+    "../interfaces/inner_api/algorithm_parameter",
+    "../interfaces/inner_api/common",
+    "../interfaces/inner_api/crypto_operation",
+    "../interfaces/inner_api/key",
   ]
 }
 
@@ -65,8 +65,6 @@ if (os_level == "standard") {
     part_name = "crypto_framework"
     public_configs = [ ":framework_config" ]
     include_dirs = framework_inc_lite_path + crypto_framwork_common_inc_path
-    include_dirs +=
-        [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ]
 
     sources = framework_lite_files
 
@@ -86,5 +84,7 @@ if (os_level == "standard") {
       "--diag_suppress",
       "Pe188,Pe186",
     ]
+
+    external_deps = [ "hilog_lite:hilog_lite" ]
   }
 }
diff --git a/frameworks/js/napi/crypto/BUILD.gn b/frameworks/js/napi/crypto/BUILD.gn
index 5cd0655..33d96ee 100644
--- a/frameworks/js/napi/crypto/BUILD.gn
+++ b/frameworks/js/napi/crypto/BUILD.gn
@@ -20,8 +20,7 @@ ohos_shared_library("cryptoframework_napi") {
   subsystem_name = "security"
   part_name = "crypto_framework"
   relative_install_dir = "module/security"
-  include_dirs =
-      [ "//base/security/crypto_framework/frameworks/js/napi/crypto/inc" ]
+  include_dirs = [ "inc" ]
   include_dirs += framework_inc_path
 
   if (os_level == "standard") {
@@ -62,7 +61,7 @@ ohos_shared_library("cryptoframework_napi") {
     "src/napi_verify.cpp",
   ]
 
-  deps = [ "//base/security/crypto_framework/frameworks:crypto_framework_lib" ]
+  deps = [ "../../../../frameworks:crypto_framework_lib" ]
 
   external_deps = [
     "bounds_checking_function:libsec_shared",
diff --git a/plugin/BUILD.gn b/plugin/BUILD.gn
index 6a9d1e2..5e2afc4 100644
--- a/plugin/BUILD.gn
+++ b/plugin/BUILD.gn
@@ -17,11 +17,11 @@ import("//build/ohos.gni")
 
 config("plugin_config") {
   include_dirs = [
-    "//base/security/crypto_framework/interfaces/inner_api/algorithm_parameter",
-    "//base/security/crypto_framework/interfaces/inner_api/common",
-    "//base/security/crypto_framework/interfaces/inner_api/crypto_operation",
-    "//base/security/crypto_framework/interfaces/inner_api/key",
-    "//base/security/crypto_framework/frameworks/spi",
+    "../interfaces/inner_api/algorithm_parameter",
+    "../interfaces/inner_api/common",
+    "../interfaces/inner_api/crypto_operation",
+    "../interfaces/inner_api/key",
+    "../frameworks/spi",
   ]
 }
 
@@ -50,7 +50,7 @@ if (os_level == "standard") {
       "-Wall",
     ]
 
-    deps = [ "//base/security/crypto_framework/common:crypto_plugin_common" ]
+    deps = [ "../common:crypto_plugin_common" ]
 
     external_deps = [
       "c_utils:utils",
@@ -65,15 +65,15 @@ if (os_level == "standard") {
     part_name = "crypto_framework"
     public_configs = [ ":plugin_config" ]
     include_dirs = crypto_framwork_common_inc_path + mbedtls_plugin_inc_path
-    include_dirs +=
-        [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ]
 
     sources = mbedtls_plugin_files
 
     defines = [ "MINI_HILOG_ENABLE" ]
 
-    deps = [ "//base/security/crypto_framework/common:crypto_common_lite" ]
+    deps = [ "../common:crypto_common_lite" ]
 
     configs = [ "${product_path}:product_public_configs" ]
+
+    external_deps = [ "hilog_lite:hilog_lite" ]
   }
 }
-- 
Gitee