From 4a540551f40c0d5fabfa3b1422fda56a60b785d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=9D=99?= <wangjing561@huawei.com>
Date: Sat, 30 Mar 2024 16:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=95=B4=E6=94=B9=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 王静 <wangjing561@huawei.com>
---
 bundle.json                        |  6 +++---
 common/BUILD.gn                    |  7 +++----
 frameworks/BUILD.gn                |  7 +++----
 frameworks/js/napi/crypto/BUILD.gn | 16 ++++++----------
 plugin/BUILD.gn                    | 12 ++++--------
 5 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/bundle.json b/bundle.json
index f955ddc..b2135f8 100644
--- a/bundle.json
+++ b/bundle.json
@@ -25,11 +25,11 @@
         "components": [
           "hilog",
           "c_utils",
-          "napi"
-        ],
-        "third_party": [
+          "napi",
           "openssl",
           "bounds_checking_function"
+        ],
+        "third_party": [
         ]
       },
       "build": {
diff --git a/common/BUILD.gn b/common/BUILD.gn
index 512ae86..49ab3e0 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -17,10 +17,7 @@ import("//build/ohos.gni")
 ohos_static_library("crypto_plugin_common") {
   subsystem_name = "security"
   part_name = "crypto_framework"
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-  ]
+  include_dirs = []
   include_dirs += crypto_framwork_common_inc_path
 
   sources = crypto_framwork_common_files
@@ -43,6 +40,8 @@ ohos_static_library("crypto_plugin_common") {
 
   external_deps = [
     "c_utils:utils",
+    "c_utils:utilsbase",
     "hilog:libhilog",
+    "hilog:libhilog_base",
   ]
 }
diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn
index ba063dc..64915d5 100644
--- a/frameworks/BUILD.gn
+++ b/frameworks/BUILD.gn
@@ -29,10 +29,7 @@ ohos_shared_library("crypto_framework_lib") {
   innerapi_tags = [ "platformsdk" ]
   part_name = "crypto_framework"
   public_configs = [ ":framework_config" ]
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-  ]
+  include_dirs = []
   include_dirs += framework_inc_path + crypto_framwork_common_inc_path
 
   sources = framework_files
@@ -59,6 +56,8 @@ ohos_shared_library("crypto_framework_lib") {
 
   external_deps = [
     "c_utils:utils",
+    "c_utils:utilsbase",
     "hilog:libhilog",
+    "hilog:libhilog_base",
   ]
 }
diff --git a/frameworks/js/napi/crypto/BUILD.gn b/frameworks/js/napi/crypto/BUILD.gn
index 37fa9c6..5ae45ac 100644
--- a/frameworks/js/napi/crypto/BUILD.gn
+++ b/frameworks/js/napi/crypto/BUILD.gn
@@ -19,12 +19,8 @@ ohos_shared_library("cryptoframework_napi") {
   subsystem_name = "security"
   part_name = "crypto_framework"
   relative_install_dir = "module/security"
-  include_dirs = [
-    "//third_party/bounds_checking_function/include",
-    "//commonlibrary/c_utils/base/include",
-    "//base/security/crypto_framework/frameworks/js/napi/crypto/inc",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-  ]
+  include_dirs =
+      [ "//base/security/crypto_framework/frameworks/js/napi/crypto/inc" ]
   include_dirs += framework_inc_path
 
   if (os_level == "standard") {
@@ -66,13 +62,13 @@ ohos_shared_library("cryptoframework_napi") {
     "src/napi_verify.cpp",
   ]
 
-  deps = [
-    "//base/security/crypto_framework/frameworks:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//base/security/crypto_framework/frameworks:crypto_framework_lib" ]
 
   external_deps = [
+    "bounds_checking_function:libsec_shared",
+    "c_utils:utilsbase",
     "hilog:libhilog",
+    "hilog:libhilog_base",
     "napi:ace_napi",
   ]
 }
diff --git a/plugin/BUILD.gn b/plugin/BUILD.gn
index 20292e7..69c9469 100644
--- a/plugin/BUILD.gn
+++ b/plugin/BUILD.gn
@@ -30,10 +30,7 @@ ohos_shared_library("crypto_openssl_plugin_lib") {
   innerapi_tags = [ "platformsdk_indirect" ]
   part_name = "crypto_framework"
   public_configs = [ ":plugin_config" ]
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//third_party/openssl/include/",
-  ]
+  include_dirs = []
   include_dirs += plugin_inc_path + crypto_framwork_common_inc_path
 
   sources = plugin_files
@@ -52,14 +49,13 @@ ohos_shared_library("crypto_openssl_plugin_lib") {
     "-Wall",
   ]
 
-  deps = [
-    "//base/security/crypto_framework/common:crypto_plugin_common",
-    "//third_party/openssl:libcrypto_shared",
-  ]
+  deps = [ "//base/security/crypto_framework/common:crypto_plugin_common" ]
 
   external_deps = [
     "c_utils:utils",
+    "c_utils:utilsbase",
     "hilog:libhilog",
+    "openssl:libcrypto_shared",
   ]
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
 }
-- 
Gitee