diff --git a/bundle.json b/bundle.json index fc4204f..5506481 100644 --- a/bundle.json +++ b/bundle.json @@ -33,13 +33,7 @@ "sub_component": [], "inner_kits": [ { - "name": "//third_party/f2fs-tools/lib:libf2fs", - "header": { - "header_files": [ - "utf8data.h" - ], - "header_base": "//third_party/f2fs-tools/lib" - } + "name": "//third_party/f2fs-tools/lib:libf2fs" }, { "name": "//third_party/f2fs-tools/fsck:fsck.f2fs" diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index 9fed520..4b233f1 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -49,12 +49,13 @@ ohos_executable("fsck.f2fs") { "//third_party/f2fs-tools", "//third_party/f2fs-tools/include", "//third_party/f2fs-tools/lib", - "//third_party/e2fsprogs/e2fsprogs/contrib/android", ] - deps = [ - "//third_party/e2fsprogs:libdacconfig", - "//third_party/f2fs-tools/lib:libf2fs", + deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] + + public_external_deps = [ + "e2fsprogs:e2fsdroid", + "e2fsprogs:libdacconfig", ] defines = [ "HAVE_CONFIG_H" ] diff --git a/mkfs/BUILD.gn b/mkfs/BUILD.gn index 5cea424..ff5a429 100644 --- a/mkfs/BUILD.gn +++ b/mkfs/BUILD.gn @@ -27,16 +27,14 @@ ohos_executable("mkfs.f2fs") { include_dirs = [ ".", - "//third_party/e2fsprogs/e2fsprogs/lib/uuid", "//third_party/f2fs-tools", "//third_party/f2fs-tools/include", "//third_party/f2fs-tools/lib", ] - deps = [ - "//third_party/e2fsprogs:libext2_uuid", - "//third_party/f2fs-tools/lib:libf2fs", - ] + deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] + + public_external_deps = [ "e2fsprogs:libext2_uuid" ] defines = [ "HAVE_CONFIG_H" ]