commit 11da2203a00bb8121275d9a110190d7f70df1073
author dslomov <dslomov@google.com> Thu Jul 27 23:48:56 2017 +0200
committer Jakob Buchgraber <buchgr@google.com> Fri Jul 28 10:44:54 2017 +0200
tree 97a5aab8d40af86af9a7068c91c17d2fdca1201c
parent da4c959603280ded71ad8fbc2d30d4917b175750

Assert that declared providers are not TransitiveInfoProviders.

Also fix the remaining violations.

RELNOTES: None.
PiperOrigin-RevId: 163391215

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

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
index 2673fab..ec5a58f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
@@ -111,7 +111,7 @@
 
     TransitiveInfoProviderMapBuilder aspectProviders = new TransitiveInfoProviderMapBuilder();
     if (mergedOutputGroupProvider != null) {
-      aspectProviders.add(mergedOutputGroupProvider);
+      aspectProviders.put(mergedOutputGroupProvider);
     }
     if (mergedExtraActionProviders != null) {
       aspectProviders.add(mergedExtraActionProviders);
@@ -121,7 +121,7 @@
       TransitiveInfoProviderMap providers = aspect.getProviders();
       for (int i = 0; i < providers.getProviderCount(); ++i) {
         Object providerKey = providers.getProviderKeyAt(i);
-        if (OutputGroupProvider.class.equals(providerKey)
+        if (OutputGroupProvider.SKYLARK_CONSTRUCTOR.getKey().equals(providerKey)
             || ExtraActionArtifactsProvider.class.equals(providerKey)) {
           continue;
         }
@@ -163,7 +163,7 @@
     }
 
     for (ConfiguredAspect configuredAspect : aspects) {
-      OutputGroupProvider aspectProvider = OutputGroupProvider.get(configuredAspect);;
+      OutputGroupProvider aspectProvider = OutputGroupProvider.get(configuredAspect);
       if (aspectProvider == null) {
         continue;
       }