From 9db81d9474b440f2ba30e59b070430bbc709b197 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Tue, 30 Jun 2026 11:13:55 -0700
Subject: [PATCH] Remove explicit rule restriction on deps

Previously this list of rules was used for what deps were allowed, but
the providers is a more lenient way to do this. This allows rulesets to
write native android rules as long as they correctly use CcInfo, without
having to wrap it in an empty cc_library.
---
 rules/android_binary/attrs.bzl | 43 ++++++++++------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/rules/android_binary/attrs.bzl b/rules/android_binary/attrs.bzl
index b6cd67c6e..cf4bf0ed6 100644
--- a/rules/android_binary/attrs.bzl
+++ b/rules/android_binary/attrs.bzl
@@ -13,6 +13,8 @@
 # limitations under the License.
 """Attributes."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("//providers:providers.bzl", "StarlarkApkInfo")
 load("//rules:android_neverlink_aspect.bzl", "android_neverlink_aspect")
 load("//rules:android_platforms_transition.bzl", "android_platforms_transition")
@@ -27,38 +29,9 @@ load(
     "split_config_aspect",
 )
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
-load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 
 visibility(PROJECT_VISIBILITY)
 
-def make_deps(allow_rules, providers, aspects):
-    return attr.label_list(
-        allow_rules = allow_rules,
-        providers = providers,
-        aspects = aspects,
-        cfg = android_split_transition,
-    )
-
-DEPS_ALLOW_RULES = [
-    "aar_import",
-    "android_library",
-    "cc_library",
-    "java_import",
-    "java_library",
-    "java_lite_proto_library",
-]
-
-DEPS_PROVIDERS = [
-    [CcInfo],
-    [JavaInfo],
-]
-
-DEPS_ASPECTS = [
-    dex_desugar_aspect,
-    android_neverlink_aspect,
-]
-
 ATTRS = _attrs.replace(
     _attrs.add(
         dict(
@@ -66,7 +39,17 @@ ATTRS = _attrs.replace(
                 # TODO(timpeut): Set PropertyFlag direct_compile_time_input
                 allow_files = [".java", ".srcjar"],
             ),
-            deps = make_deps(DEPS_ALLOW_RULES, DEPS_PROVIDERS, DEPS_ASPECTS),
+            deps = attr.label_list(
+                providers = [
+                    [CcInfo],
+                    [JavaInfo],
+                ],
+                aspects = [
+                    dex_desugar_aspect,
+                    android_neverlink_aspect,
+                ],
+                cfg = android_split_transition,
+            ),
             enable_data_binding = attr.bool(),
             instruments = attr.label(),
             manifest_values = attr.string_dict(),