diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-20 02:20:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-20 02:20:09 +0000 |
commit | 904811069898112fe22793c0bf6912434c8d347b (patch) | |
tree | e4317e067349d09ebf1cb1b5514b0721fccd09f3 | |
parent | dde6b6655b9c84cdea53b119723d2d6f442b6dc9 (diff) | |
parent | e355ad55f017cbb4ca132f53b035357f8463e5cd (diff) | |
download | bazel-904811069898112fe22793c0bf6912434c8d347b.tar.gz |
Merge "Add mkfs.erofs to path during partition builds" into main am: e355ad55f0
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2798312
Change-Id: I677b1b288d1014abcd8eb52e48d2624933bc46df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | rules/partitions/BUILD | 1 | ||||
-rw-r--r-- | rules/partitions/partition.bzl | 1 | ||||
-rw-r--r-- | rules/partitions/toolchain.bzl | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/rules/partitions/BUILD b/rules/partitions/BUILD index feff7e58..bfa3ff85 100644 --- a/rules/partitions/BUILD +++ b/rules/partitions/BUILD @@ -9,6 +9,7 @@ partition_toolchain( e2fsdroid = "//external/e2fsprogs/contrib/android:e2fsdroid", fec = "//system/extras/verity/fec", mke2fs = "//external/e2fsprogs/misc:mke2fs", + mkfs_erofs = "//external/erofs-utils:mkfs.erofs", mkuserimg_mke2fs = "//system/extras/ext4_utils:mkuserimg_mke2fs", openssl = "//prebuilts/build-tools:linux-x86/bin/openssl", simg2img = "//system/core/libsparse:simg2img", diff --git a/rules/partitions/partition.bzl b/rules/partitions/partition.bzl index 1584333d..c0ea2c4c 100644 --- a/rules/partitions/partition.bzl +++ b/rules/partitions/partition.bzl @@ -161,6 +161,7 @@ def _partition_impl(ctx): toolchain.e2fsdroid[DefaultInfo].files_to_run, toolchain.fec[DefaultInfo].files_to_run, toolchain.mke2fs[DefaultInfo].files_to_run, + toolchain.mkfs_erofs[DefaultInfo].files_to_run, toolchain.mkuserimg_mke2fs[DefaultInfo].files_to_run, toolchain.simg2img[DefaultInfo].files_to_run, toolchain.tune2fs[DefaultInfo].files_to_run, diff --git a/rules/partitions/toolchain.bzl b/rules/partitions/toolchain.bzl index 9bdc8290..644bffbc 100644 --- a/rules/partitions/toolchain.bzl +++ b/rules/partitions/toolchain.bzl @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +""" +The toolchain used by the partition rule. +""" + PartitionToolchainInfo = provider( doc = "Partitions toolchain", fields = [ @@ -20,6 +24,7 @@ PartitionToolchainInfo = provider( "e2fsdroid", "fec", "mke2fs", + "mkfs_erofs", "mkuserimg_mke2fs", "openssl", "simg2img", @@ -36,6 +41,7 @@ def _partition_toolchain_impl(ctx): e2fsdroid = ctx.attr.e2fsdroid, fec = ctx.attr.fec, mke2fs = ctx.attr.mke2fs, + mkfs_erofs = ctx.attr.mkfs_erofs, mkuserimg_mke2fs = ctx.attr.mkuserimg_mke2fs, openssl = ctx.file.openssl, simg2img = ctx.attr.simg2img, @@ -53,6 +59,7 @@ partition_toolchain = rule( "e2fsdroid": attr.label(cfg = "exec", executable = True, mandatory = True), "fec": attr.label(cfg = "exec", executable = True, mandatory = True), "mke2fs": attr.label(cfg = "exec", executable = True, mandatory = True), + "mkfs_erofs": attr.label(cfg = "exec", executable = True, mandatory = True), "mkuserimg_mke2fs": attr.label(cfg = "exec", executable = True, mandatory = True), "openssl": attr.label(allow_single_file = True, cfg = "exec", mandatory = True), "simg2img": attr.label(cfg = "exec", executable = True, mandatory = True), |