!1528 把fsmanager从libbegetutil.z.so中移出

Merge pull request !1528 from yichengzhao/monthly

bundle.json

@@ -74,7 +74,6 @@
                         "header_files": [
                             "init_socket.h",
                             "init_file.h",
-                            "fs_manager/fs_manager.h",
                             "init_reboot.h",
                             "service_control.h",
                             "beget_ext.h",
@@ -88,6 +87,15 @@
                     },
                     "name": "//base/startup/init/interfaces/innerkits:libbegetutil"
                 },
+                {
+                    "header": {
+                        "header_base": "//base/startup/init/interfaces/innerkits/include/fs_manager/",
+                        "header_files": [
+                            "fs_manager.h"
+                        ]
+                    },
+                    "name": "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static"
+                },
                 {
                     "header": {
                         "header_base": "//base/startup/init/interfaces/innerkits/include/",

interfaces/innerkits/BUILD.gn

@@ -25,7 +25,6 @@ config("exported_header_files") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/include/syspara",
-    "//base/startup/init/interfaces/innerkits/include/fs_manager",
     "//base/startup/init/interfaces/innerkits/include/token",
     "//base/startup/init/interfaces/innerkits/include/sandbox/include",
     "//base/startup/init/services/include",
@@ -188,7 +187,6 @@ if (defined(ohos_lite)) {
       "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
       "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
       "//base/startup/init/interfaces/innerkits/file:libfile",
-      "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
       "//base/startup/init/interfaces/innerkits/sandbox:sandbox",
       "//base/startup/init/interfaces/innerkits/socket:libsocket",
       "//base/startup/init/services/log:agent_log",

test/fuzztest/BUILD.gn

@@ -115,6 +115,7 @@ ohos_fuzztest("MountAllFstabFuzzTest") {
 
   deps = [
     "//base/startup/init/interfaces/innerkits:libbegetutil",
+    "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
     "//base/startup/init/test/fuzztest:libfuzz_utils",
     "//third_party/bounds_checking_function:libsec_static",
   ]
@@ -501,6 +502,7 @@ ohos_fuzztest("UmountAllFstabFuzzTest") {
 
   deps = [
     "//base/startup/init/interfaces/innerkits:libbegetutil",
+    "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
     "//base/startup/init/test/fuzztest:libfuzz_utils",
     "//third_party/bounds_checking_function:libsec_static",
   ]