From 3fa3a7277a2d74549bf7d29402c16e757534849a Mon Sep 17 00:00:00 2001
From: tongkai0808fh <tongkai5@huawei.com>
Date: Thu, 29 Feb 2024 08:38:08 +0000
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E4=BE=9D=E8=B5=96f2fs-tools?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
---
 bundle.json                                 |  3 ++-
 services/storage_daemon/BUILD.gn            |  3 ++-
 services/storage_daemon/libfscrypt/BUILD.gn | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bundle.json b/bundle.json
index 0e1a06a2..40a82c59 100644
--- a/bundle.json
+++ b/bundle.json
@@ -57,7 +57,8 @@
       "third_party": [
         "bounds_checking_function",
         "e2fsprogs",
-        "openssl"
+        "openssl",
+        "f2fs-tools"
       ]
     },
     "build": {
diff --git a/services/storage_daemon/BUILD.gn b/services/storage_daemon/BUILD.gn
index 179bcfa5..4c3697ba 100644
--- a/services/storage_daemon/BUILD.gn
+++ b/services/storage_daemon/BUILD.gn
@@ -297,11 +297,12 @@ group("storage_daemon_third_party") {
       "//third_party/FreeBSD/sbin/newfs_msdos:newfs_msdos",
       "//third_party/e2fsprogs:blkid",
       "//third_party/exfatprogs:exfatprogs",
-      "//third_party/f2fs-tools:f2fs-tools",
+      # "//third_party/f2fs-tools:f2fs-tools",
       "//third_party/gptfdisk:sgdisk",
       "//third_party/ntfs-3g:ntfsprogs",
     ]
   }
+  external_deps = [ "f2fs-tools:libf2fs" ]
 }
 
 group("storage_daemon_unit_test") {
diff --git a/services/storage_daemon/libfscrypt/BUILD.gn b/services/storage_daemon/libfscrypt/BUILD.gn
index 698ec629..2ba4ed83 100644
--- a/services/storage_daemon/libfscrypt/BUILD.gn
+++ b/services/storage_daemon/libfscrypt/BUILD.gn
@@ -32,6 +32,17 @@ config("fscrypt_utils_config") {
   ]
 }
 
+config("fscrypt_utils_public_config") {
+  visibility = [ ":*" ]
+
+  include_dirs = [ "../include/libfscrypt" ]
+
+  cflags = [
+    "-g3",
+    "-Wall",
+  ]
+}
+
 ohos_static_library("libfscryptutils") {
   stack_protector_ret = true
   sanitize = {
@@ -91,6 +102,7 @@ ohos_static_library("libfscryptutils_static") {
   }
 
   configs = [ ":fscrypt_utils_config" ]
+  public_configs = [ ":fscrypt_utils_public_config" ]
 
   external_deps = [
     "c_utils:utils",