Attach aspects to proto attributes defined by Starlark flags.

PiperOrigin-RevId: 857263444
Change-Id: I9abb73442416229cad95cd83330af8273dd160dc

Author: A Googler

mobile_install/adapters/java_lite_proto_library.bzl

@@ -26,7 +26,7 @@ visibility(PROJECT_VISIBILITY)
 
 def _aspect_attrs():
     """Attrs of the rule requiring traversal by the aspect."""
-    return ["deps", "_aspect_proto_toolchain_for_javalite"]
+    return ["deps", "_aspect_proto_toolchain_for_javalite", "_proto_toolchain_for_javalite"]
 
 def _adapt(target, ctx):
     """Adapts the rule and target data.
@@ -40,19 +40,23 @@ def _adapt(target, ctx):
     """
     if not ctx.rule.attr.deps:
         return []
+    if getattr(ctx.rule.attr, "_aspect_proto_toolchain_for_javalite"):
+        toolchain_dep = [ctx.rule.attr._aspect_proto_toolchain_for_javalite]
+    else:
+        toolchain_dep = [ctx.rule.attr._proto_toolchain_for_javalite]
     return [
         providers.make_mi_android_dex_info(
             deps = providers.collect(
                 MIAndroidDexInfo,
                 ctx.rule.attr.deps,
-                [ctx.rule.attr._aspect_proto_toolchain_for_javalite],
+                toolchain_dep,
             ),
         ),
         providers.make_mi_java_resources_info(
             deps = providers.collect(
                 MIJavaResourcesInfo,
                 ctx.rule.attr.deps,
-                [ctx.rule.attr._aspect_proto_toolchain_for_javalite],
+                toolchain_dep,
             ),
         ),
     ]

rules/dex_desugar_aspect.bzl

@@ -35,6 +35,7 @@ _ATTR_ASPECTS = [
     "_build_stamp_deps",  # for build stamp runtime class deps
     "_build_stamp_mergee_manifest_lib",  # for empty build stamp Service class implementation
     "_desugared_lib_config",  # For java8 desugaring config file
+    "_proto_toolchain_for_javalite",  # To get from proto_library through proto_lang_toolchain rule to proto runtime library.
     "_toolchain",  # For _java_lite_grpc_library
     "deps",
     "exports",