Add a tool zipper in Android toolchain and use it as the executable in baseline profile ZipArtProfile action rather than zip_tool.
PiperOrigin-RevId: 544718619
Change-Id: If217f43ebcbef6caf9c8acc5a60abc2ad0028e34
diff --git a/rules/baseline_profiles.bzl b/rules/baseline_profiles.bzl
index dd145ec..7909d49 100644
--- a/rules/baseline_profiles.bzl
+++ b/rules/baseline_profiles.bzl
@@ -80,7 +80,7 @@
zip_args.add(output_profile_meta.path, format = "assets/dexopt/baseline.profm=%s")
ctx.actions.run(
mnemonic = "ZipARTProfiles",
- executable = get_android_toolchain(ctx).zip_tool.files_to_run,
+ executable = get_android_toolchain(ctx).zipper.files_to_run,
progress_message = "Zip ART Profiles for %{label}",
arguments = [zip_args],
inputs = [output_profile, output_profile_meta],
diff --git a/toolchains/android/toolchain.bzl b/toolchains/android/toolchain.bzl
index 92cddf2..868eb1f 100644
--- a/toolchains/android/toolchain.bzl
+++ b/toolchains/android/toolchain.bzl
@@ -232,6 +232,11 @@
default = "@bazel_tools//tools/android:zip_filter",
executable = True,
),
+ zipper = attr.label(
+ cfg = "exec",
+ default = "@bazel_tools//tools/zip:zipper",
+ executable = True,
+ ),
dex_zips_merger = attr.label(
cfg = "exec",
default = "@bazel_tools//tools/android:merge_dexzips",
