提交 b8f94f4d 编写于 作者: H handyohos 提交者: yichengzhao

bugfix: remove fsmanager_static from libbegetutil.

1) remove fsmanager_static from libbegetutil
2) declare fsmanager_static as inner api for updater only
3) remove begetctl and partitionslot dependency for fsmanager by accessing /dev/block/by-name/misc directly
Signed-off-by: Nhandyohos <zhangxiaotian@huawei.com>
Change-Id: I5288d77b07e5e993cbe68eff8803a130a11b009a
上级 a5858685
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
"header_files": [ "header_files": [
"init_socket.h", "init_socket.h",
"init_file.h", "init_file.h",
"fs_manager/fs_manager.h",
"init_reboot.h", "init_reboot.h",
"service_control.h", "service_control.h",
"beget_ext.h", "beget_ext.h",
...@@ -88,6 +87,15 @@ ...@@ -88,6 +87,15 @@
}, },
"name": "//base/startup/init/interfaces/innerkits:libbegetutil" "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": {
"header_base": "//base/startup/init/interfaces/innerkits/include/", "header_base": "//base/startup/init/interfaces/innerkits/include/",
......
...@@ -25,7 +25,6 @@ config("exported_header_files") { ...@@ -25,7 +25,6 @@ config("exported_header_files") {
include_dirs = [ include_dirs = [
"//base/startup/init/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/syspara", "//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/token",
"//base/startup/init/interfaces/innerkits/include/sandbox/include", "//base/startup/init/interfaces/innerkits/include/sandbox/include",
"//base/startup/init/services/include", "//base/startup/init/services/include",
...@@ -188,7 +187,6 @@ if (defined(ohos_lite)) { ...@@ -188,7 +187,6 @@ if (defined(ohos_lite)) {
"//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
"//base/startup/init/interfaces/innerkits/fd_holder:fdholder", "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
"//base/startup/init/interfaces/innerkits/file:libfile", "//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/sandbox:sandbox",
"//base/startup/init/interfaces/innerkits/socket:libsocket", "//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init/services/log:agent_log", "//base/startup/init/services/log:agent_log",
......
文件模式从 100644 更改为 100755
...@@ -115,6 +115,7 @@ ohos_fuzztest("MountAllFstabFuzzTest") { ...@@ -115,6 +115,7 @@ ohos_fuzztest("MountAllFstabFuzzTest") {
deps = [ deps = [
"//base/startup/init/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
"//base/startup/init/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -501,6 +502,7 @@ ohos_fuzztest("UmountAllFstabFuzzTest") { ...@@ -501,6 +502,7 @@ ohos_fuzztest("UmountAllFstabFuzzTest") {
deps = [ deps = [
"//base/startup/init/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
"//base/startup/init/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册