diff --git a/BUILD.gn b/BUILD.gn index 6e867c4179e48f098db3fd86307171bbcaf07704..efa75f4cfa07baa60b488a4baa76af885fac7d2a 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,7 +3,6 @@ import("//build/ohos.gni") group("e2fsprogs") { deps = [ "//third_party/e2fsprogs/e2fsck:e2fsck", - "//third_party/e2fsprogs/e2fsck:e2fsck($host_toolchain)", "//third_party/e2fsprogs/lib/blkid:libext2_blkid", "//third_party/e2fsprogs/lib/e2p:libext2_e2p", "//third_party/e2fsprogs/lib/et:libext2_com_err", @@ -13,14 +12,22 @@ group("e2fsprogs") { "//third_party/e2fsprogs/misc:blkid", "//third_party/e2fsprogs/misc:libext2_misc", "//third_party/e2fsprogs/misc:mke2fs", - "//third_party/e2fsprogs/misc:mke2fs($host_toolchain)", "//third_party/e2fsprogs/resize:resize2fs", ] if (target_cpu != "riscv64") { - deps += [ - "//third_party/e2fsprogs/contrib/android:e2fsdroid", - "//third_party/e2fsprogs/contrib/android:e2fsdroid($host_toolchain)", - ] + deps += [ "//third_party/e2fsprogs/contrib/android:e2fsdroid" ] + } + public_deps = [ "//third_party/boringssl:crypto" ] +} + +group("e2fsprogs_host_toolchain") { + deps = [ + "//third_party/e2fsprogs/e2fsck:e2fsck($host_toolchain)", + "//third_party/e2fsprogs/misc:mke2fs($host_toolchain)", + ] + if (target_cpu != "riscv64") { + deps += + [ "//third_party/e2fsprogs/contrib/android:e2fsdroid($host_toolchain)" ] } public_deps = [ "//third_party/boringssl:crypto" ] } diff --git a/bundle.json b/bundle.json index d4d183abdddc90a81c1094c5b561d1f1d36da9eb..177ace732e84aa7b15a4ca77926ef1c9a0f365e8 100644 --- a/bundle.json +++ b/bundle.json @@ -14,8 +14,8 @@ "en": "README" }, "component": { - "name": "thirdparty_e2fsprogs", - "subsystem": "", + "name": "e2fsprogs", + "subsystem": "thirdparty", "syscap": [], "features": [], "adapted_system_type": [], diff --git a/contrib/android/BUILD.gn b/contrib/android/BUILD.gn index cf08dd9708341e6d5c1c0e232a9ff01277433f82..58cd3b1d63a63013ae527dda398eeb5781d891e4 100644 --- a/contrib/android/BUILD.gn +++ b/contrib/android/BUILD.gn @@ -21,7 +21,7 @@ ohos_static_library("libdacconfig") { sources = [ "dac_config.cpp" ] part_name = "e2fsprogs" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" } config("e2fsprogs-defaults") { cflags = [ @@ -63,8 +63,8 @@ ohos_executable("e2fsdroid") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/e2fsck/BUILD.gn b/e2fsck/BUILD.gn index 006c37b1ec463b34307a7d5dbc95992bbef638bb..07f460ec885494afed63803954feb1201b86f8e2 100644 --- a/e2fsck/BUILD.gn +++ b/e2fsck/BUILD.gn @@ -65,8 +65,8 @@ ohos_executable("e2fsck") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/blkid/BUILD.gn b/lib/blkid/BUILD.gn index 0949c7729d8997cb80641406259c40df6da46047..5117949a945df7dc22ed999202ed554f46908749 100644 --- a/lib/blkid/BUILD.gn +++ b/lib/blkid/BUILD.gn @@ -53,8 +53,8 @@ ohos_shared_library("libext2_blkid") { "-fno-strict-aliasing", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/e2p/BUILD.gn b/lib/e2p/BUILD.gn index 7f265f6ef75c8758414e10a5dccc9e0f268014d5..4b3c6a6decbfad118faa5507739b01f60c12d554 100644 --- a/lib/e2p/BUILD.gn +++ b/lib/e2p/BUILD.gn @@ -60,8 +60,8 @@ ohos_shared_library("libext2_e2p") { "-Wno-unused-parameter", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/et/BUILD.gn b/lib/et/BUILD.gn index 2ef987673a79a7032f2cef0cb3726f111b0c9df5..5e2b0b59719396f3b6184b26e9122570c25280c9 100644 --- a/lib/et/BUILD.gn +++ b/lib/et/BUILD.gn @@ -39,8 +39,8 @@ ohos_shared_library("libext2_com_err") { ":libext2-headers", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/ext2fs/BUILD.gn b/lib/ext2fs/BUILD.gn index 63b75a7a0c904bcc8a78789143d7ffdaf298c629..c2e0ba5e6be5004e6818eeaced3f1afc3831274b 100644 --- a/lib/ext2fs/BUILD.gn +++ b/lib/ext2fs/BUILD.gn @@ -121,8 +121,8 @@ ohos_shared_library("libext2fs") { "//third_party/e2fsprogs/lib", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/support/BUILD.gn b/lib/support/BUILD.gn index d923d58b1f45fb3ba1502fe43cf4de5dea97791f..d45c4414dbbdc9fdb0cdb9a8331adf7b6e1dd115 100644 --- a/lib/support/BUILD.gn +++ b/lib/support/BUILD.gn @@ -46,8 +46,8 @@ ohos_shared_library("libext2_quota") { "//third_party/e2fsprogs/lib/ext2fs:libext2fs", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/lib/uuid/BUILD.gn b/lib/uuid/BUILD.gn index 4004af72e9f2371f7f8c0e35de32e46de6bbc074..cbb0d4b801d0f100ff06d92e10cbc2493c692e9d 100644 --- a/lib/uuid/BUILD.gn +++ b/lib/uuid/BUILD.gn @@ -44,8 +44,8 @@ ohos_shared_library("libext2_uuid") { ":libext2-headers", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/misc/BUILD.gn b/misc/BUILD.gn index ffa4d89b35c247eedafd8d9f470b6d73049f5c22..662d7041c6b1c7d8c901e7e93101563f879874f8 100644 --- a/misc/BUILD.gn +++ b/misc/BUILD.gn @@ -31,8 +31,8 @@ ohos_shared_library("libext2_misc") { "//third_party/e2fsprogs/lib/support:libext2_quota", ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", @@ -73,8 +73,8 @@ ohos_executable("mke2fs") { ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater", diff --git a/prebuilt/target/BUILD.gn b/prebuilt/target/BUILD.gn index 464fec4c7ca2af51e5d8a4eeff0cc1f41092774b..946a1926e272dd392e505b06191c7eae99a72d69 100644 --- a/prebuilt/target/BUILD.gn +++ b/prebuilt/target/BUILD.gn @@ -2,77 +2,77 @@ import("//build/ohos.gni") ohos_prebuilt_executable("mke2fs") { source = "bin/mke2fs" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsdroid") { source = "bin/e2fsdroid" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_executable("e2fsck") { source = "bin/e2fsck" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_blkid") { source = "lib/libext2_blkid.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_com_err") { source = "lib/libext2_com_err.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_e2p") { source = "lib/libext2_e2p.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2fs") { source = "lib/libext2fs.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_misc") { source = "lib/libext2_misc.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_quota") { source = "lib/libext2_quota.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libext2_uuid") { source = "lib/libext2_uuid.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } ohos_prebuilt_shared_library("libcrypto") { source = "lib/libcrypto.so" - subsystem_name = "distributeddatamgr" + subsystem_name = "thirdparty" part_name = "e2fsprogs" install_enable = true } diff --git a/resize/BUILD.gn b/resize/BUILD.gn index 960048f44ab9a5a0572130bcb0bdd14a3fee4155..881c6a15cc93fcd6a7c4a842d871b2db1e7ce92e 100755 --- a/resize/BUILD.gn +++ b/resize/BUILD.gn @@ -48,8 +48,8 @@ ohos_executable("resize2fs") { ldflags = [ "-stdlib=libc++_static" ] install_enable = true - subsystem_name = "distributeddatamgr" - part_name = "distributedfilejs" + subsystem_name = "thirdparty" + part_name = "e2fsprogs" install_images = [ "system", "updater",