From adaa40c1c8eb6cd238f5f2ac7c0f029f6906d616 Mon Sep 17 00:00:00 2001
From: 18721213663 <zhuhongtao12@huawei.com>
Date: Tue, 14 Feb 2023 14:53:39 +0800
Subject: [PATCH] fileapi_add_libn2innerkit

Signed-off-by: 18721213663 <zhuhongtao12@huawei.com>
---
 bundle.json                 |  9 +++++++++
 interfaces/kits/js/BUILD.gn | 32 ++++++--------------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/bundle.json b/bundle.json
index be6f41052..051ad6b08 100644
--- a/bundle.json
+++ b/bundle.json
@@ -54,6 +54,15 @@
               ],
               "header_base": "//foundation/filemanagement/file_api/interfaces/kits/native/remote_uri"
             }
+          },
+          {
+            "name": "//foundation/filemanagement/file_api/utils/filemgmt_libn:filemgmt_libn",
+            "header": {
+              "header_files": [
+                "filemgmt_libn.h"
+              ],
+              "header_base": "//foundation/filemanagement/file_api/utils/filemgmt_libn/include"
+            }
           }
         ],
         "test": [
diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index 5f3a81959..4e93b574d 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -108,8 +108,6 @@ ohos_shared_library("fs") {
   include_dirs = [
     "${src_path}/common/file_helper",
     "${src_path}/mod_fs",
-    "${utils_path}/filemgmt_libn/include",
-    "${utils_path}/filemgmt_libn/include/n_async",
     "//third_party/libuv/include",
   ]
 
@@ -162,11 +160,7 @@ ohos_shared_library("hash") {
 
   relative_install_dir = "module/file"
 
-  include_dirs = [
-    "${src_path}/common/file_helper",
-    "${utils_path}/filemgmt_libn/include",
-    "${utils_path}/filemgmt_libhilog",
-  ]
+  include_dirs = [ "${src_path}/common/file_helper" ]
 
   sources = [
     "src/common/file_helper/fd_guard.cpp",
@@ -176,7 +170,6 @@ ohos_shared_library("hash") {
   ]
 
   deps = [
-    "${utils_path}/filemgmt_libhilog:filemgmt_libhilog",
     "${utils_path}/filemgmt_libn:filemgmt_libn",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/openssl:libcrypto_shared",
@@ -229,10 +222,7 @@ ohos_shared_library("statfs") {
     "src/mod_statfs/statfs_napi.cpp",
   ]
 
-  deps = [
-    "//foundation/filemanagement/file_api/utils/filemgmt_libhilog",
-    "//foundation/filemanagement/file_api/utils/filemgmt_libn",
-  ]
+  deps = [ "${utils_path}/filemgmt_libn:filemgmt_libn" ]
 }
 
 ohos_shared_library("statvfs") {
@@ -246,10 +236,7 @@ ohos_shared_library("statvfs") {
     "src/mod_statvfs/statvfs_napi.cpp",
   ]
 
-  deps = [
-    "//foundation/filemanagement/file_api/utils/filemgmt_libhilog",
-    "//foundation/filemanagement/file_api/utils/filemgmt_libn",
-  ]
+  deps = [ "${utils_path}/filemgmt_libn:filemgmt_libn" ]
 }
 
 ohos_shared_library("environment") {
@@ -263,10 +250,7 @@ ohos_shared_library("environment") {
     "src/mod_environment/environment_napi.cpp",
   ]
 
-  deps = [
-    "//foundation/filemanagement/file_api/utils/filemgmt_libhilog",
-    "//foundation/filemanagement/file_api/utils/filemgmt_libn",
-  ]
+  deps = [ "${utils_path}/filemgmt_libn:filemgmt_libn" ]
 
   external_deps = [
     "access_token:libtokenid_sdk",
@@ -282,16 +266,12 @@ ohos_shared_library("securitylabel") {
 
   cflags = [ "-Wno-format" ]
 
-  sources = file_common_src
-  sources += [
+  sources = [
     "src/mod_securitylabel/securitylabel_n_exporter.cpp",
     "src/mod_securitylabel/securitylabel_napi.cpp",
   ]
 
-  deps = [
-    "//foundation/filemanagement/file_api/utils/filemgmt_libhilog",
-    "//foundation/filemanagement/file_api/utils/filemgmt_libn",
-  ]
+  deps = [ "${utils_path}/filemgmt_libn:filemgmt_libn" ]
 }
 
 ohos_shared_library("document") {
-- 
Gitee