From 09525c3ad03f439b1427d01343bf083bcf271422 Mon Sep 17 00:00:00 2001 From: Kaiyi Li Date: Wed, 3 Jun 2026 15:10:34 +0000 Subject: [PATCH] android_application: set the default _merge_manifests attribute correctly merge_feature_manifests.par is a zip file, and is not executable. Just use the original `py_binary` target. And since the `py_binary` target has multiple files, we remove `allow_single_file = True`. --- rules/android_application/BUILD | 7 ------- rules/android_application/attrs.bzl | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/rules/android_application/BUILD b/rules/android_application/BUILD index 92cde8e7e..080537000 100644 --- a/rules/android_application/BUILD +++ b/rules/android_application/BUILD @@ -40,10 +40,3 @@ py_binary( "@py_absl//absl/flags", ], ) - -filegroup( - name = "merge_feature_manifests.par", - srcs = [":merge_feature_manifests"], - output_group = "python_zip_file", - visibility = ["//visibility:public"], -) diff --git a/rules/android_application/attrs.bzl b/rules/android_application/attrs.bzl index 88fb2ff4c..742681c8e 100644 --- a/rules/android_application/attrs.bzl +++ b/rules/android_application/attrs.bzl @@ -81,8 +81,7 @@ ANDROID_APPLICATION_ATTRS = _attrs.add( default = Label("//tools/jdk:toolchain_android_only"), ), _merge_manifests = attr.label( - default = ":merge_feature_manifests.par", - allow_single_file = True, + default = ":merge_feature_manifests", cfg = "exec", executable = True, ),