commit 6c28fe995df7ae64fce9ae76dabaacbede29afdc
author Vladimir Moskva <vladmos@google.com> Fri Mar 03 12:55:08 2017 +0000
committer Yue Gan <yueg@google.com> Mon Mar 06 09:44:00 2017 +0000
tree 11323834a205f6dc0ccc74bb1adf5f4e15572114
parent 7b295d34f3a4f42c13aafc1cc8afba3cb4aa2985

Support declared providers for aspects

Fixes #2016

--
PiperOrigin-RevId: 149102037
MOS_MIGRATED_REVID=149102037

src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index 8578e76..48fdc0c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -31,6 +31,7 @@
 import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.ClassObjectConstructor;
 import com.google.devtools.build.lib.packages.SkylarkClassObject;
+import com.google.devtools.build.lib.packages.SkylarkClassObjectConstructor;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.util.Preconditions;
 import java.util.Arrays;
@@ -110,6 +111,8 @@
     private final Map<String, NestedSetBuilder<Artifact>> outputGroupBuilders = new TreeMap<>();
     private final ImmutableMap.Builder<String, Object> skylarkProviderBuilder =
         ImmutableMap.builder();
+    private final ImmutableMap.Builder<SkylarkClassObjectConstructor.Key, SkylarkClassObject>
+        skylarkDeclaredProvidersBuilder = ImmutableMap.builder();
     private final RuleContext ruleContext;
     private final AspectDescriptor descriptor;
 
@@ -195,6 +198,19 @@
       return this;
     }
 
+    public Builder addSkylarkDeclaredProvider(SkylarkClassObject declaredProvider, Location loc)
+        throws EvalException {
+      ClassObjectConstructor constructor = declaredProvider.getConstructor();
+      SkylarkProviderValidationUtil.validateAndThrowEvalException(
+          constructor.getPrintableName(), declaredProvider, loc);
+      if (!constructor.isExported()) {
+        throw new EvalException(
+            constructor.getLocation(), "All providers must be top level values");
+      }
+      skylarkDeclaredProvidersBuilder.put(constructor.getKey(), declaredProvider);
+      return this;
+    }
+
     public ConfiguredAspect build() {
       if (!outputGroupBuilders.isEmpty()) {
         ImmutableMap.Builder<String, NestedSet<Artifact>> outputGroups = ImmutableMap.builder();
@@ -210,10 +226,10 @@
       }
 
       ImmutableMap<String, Object> skylarkProvidersMap = skylarkProviderBuilder.build();
-      if (!skylarkProvidersMap.isEmpty()) {
-        providers.add(
-            new SkylarkProviders(skylarkProvidersMap,
-                ImmutableMap.<ClassObjectConstructor.Key, SkylarkClassObject>of()));
+      ImmutableMap<SkylarkClassObjectConstructor.Key, SkylarkClassObject>
+          skylarkDeclaredProvidersMap = skylarkDeclaredProvidersBuilder.build();
+      if (!skylarkProvidersMap.isEmpty() || !skylarkDeclaredProvidersMap.isEmpty()) {
+        providers.add(new SkylarkProviders(skylarkProvidersMap, skylarkDeclaredProvidersMap));
       }
 
       addProvider(