diff options
| author |  elenairina <elenairina@google.com> | 2017-10-10 14:08:54 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-10-11 10:00:00 +0200 |
| commit | 7c605cf6ea9755a06e5abb16a631faac8ebe2937 (patch) | |
| tree | 58b2a1df3d14e9942c91729655375602c0198ead /src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java | |
| parent | ca74482825e0c0ca5d119eceab74ba4292428557 (diff) | |
Return JavaInfo providers only once in Java rules.
Previously the java rules returned some providers twice: once as regular providers and once wrapped in JavaInfo (e.g. JavaCompilationArgsProvider). This is unnecessary, inefficient and error prone. JavaInfo should be the only way of returning these providers.
RELNOTES: None.
PiperOrigin-RevId: 171663550
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java index a00d2b2dc5..9d7c90fc28 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java @@ -24,8 +24,9 @@ import com.google.devtools.build.lib.packages.AspectDefinition; import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.NativeAspectClass; +import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier; 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.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaRuntimeJarProvider; import java.util.ArrayList; import java.util.List; @@ -83,7 +84,7 @@ public class AndroidNeverlinkAspect extends NativeAspectClass implements Configu } return builder - .requireProviders(JavaCompilationArgsProvider.class) + .requireSkylarkProviders(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())) .requiresConfigurationFragments() .build(); } |