Use AliasProvider for DexArchiveAspect to "see through" alias targets until [] can be fixed.

--
PiperOrigin-RevId: 147094979
MOS_MIGRATED_REVID=147094979

2 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/Alias.java b/src/main/java/com/google/devtools/build/lib/rules/Alias.java
index 3a4570cd64..5b91f477bc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/Alias.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/Alias.java
@@ -63,7 +63,8 @@ public class Alias implements RuleConfiguredTargetFactory {
               .allowedFileTypes(FileTypeSet.ANY_FILE)
               .allowedRuleClasses(ANY_RULE)
               .mandatory())
-          .canHaveAnyProvider()
+          // Stopgap until b/35213665 is fixed: should be canHaveAnyProvider()
+          .advertiseProvider(AliasProvider.class)
           .build();
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
index 820ed2a470..5518692436 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
@@ -50,6 +50,7 @@ import com.google.devtools.build.lib.packages.NativeAspectClass;
 import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.TriState;
+import com.google.devtools.build.lib.rules.AliasProvider;
 import com.google.devtools.build.lib.rules.java.JavaCommon;
 import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider;
 import com.google.devtools.build.lib.rules.java.JavaCompilationInfoProvider;
@@ -124,7 +125,9 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu
                 // For proto_library rules, where we care about JavaCompilationArgsAspectProvider.
                 ImmutableSet.<Class<?>>of(ProtoSourcesProvider.class),
                 // For proto_lang_toolchain rules, where we just want to get at their runtime deps.
-                ImmutableSet.<Class<?>>of(ProtoLangToolchainProvider.class)))
+                ImmutableSet.<Class<?>>of(ProtoLangToolchainProvider.class),
+                // Let this aspect "see through" alias targets until b/35213665 is fixed
+                ImmutableSet.<Class<?>>of(AliasProvider.class)))
         // Parse labels since we don't have RuleDefinitionEnvironment.getLabel like in a rule
         .add(attr(ASPECT_DESUGAR_PREREQ, LABEL).cfg(HOST).exec()
             .value(Label.parseAbsoluteUnchecked(toolsRepository + "//tools/android:desugar_java8")))