diff options
author | 2018-07-31 05:42:04 -0700 | |
---|---|---|
committer | 2018-07-31 05:44:22 -0700 | |
commit | fab7203fdba85a3791cc8d3ba1f106adbb9b4ad9 (patch) | |
tree | e81fe8a278690d63eb4e3bc9efd5e19906c97589 /src/main/java/com/google/devtools/build/lib/rules/objc | |
parent | 1e5514902007f8919a52fcd77d939ef6f09c9a9d (diff) |
Add JavaSourceInfoProvider to JavaInfo.
JavaSourceInfoProvider is returned through JavaInfo instead of ConfiguredTarget
for all Java rules. Only android_library and android_binary return it directly
through ConfiguredTarget, since they don't return a JavaInfo provider.
RELNOTES: None.
PiperOrigin-RevId: 206746172
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 39cfb190aa..5caae39afa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -306,7 +306,8 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF throws InterruptedException, ActionConflictException { JavaCompilationArgsProvider compilationArgsProvider = JavaInfo.getProvider(JavaCompilationArgsProvider.class, base); - JavaSourceInfoProvider sourceInfoProvider = base.getProvider(JavaSourceInfoProvider.class); + JavaSourceInfoProvider sourceInfoProvider = + JavaInfo.getProvider(JavaSourceInfoProvider.class, base); JavaGenJarsProvider genJarProvider = JavaInfo.getProvider(JavaGenJarsProvider.class, base); ImmutableSet.Builder<Artifact> javaSourceFilesBuilder = ImmutableSet.builder(); ImmutableSet.Builder<Artifact> javaSourceJarsBuilder = ImmutableSet.builder(); |