diff options
author | Alex Humesky <ahumesky@google.com> | 2015-10-21 21:35:46 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-10-22 15:16:46 +0000 |
commit | f7deff91dec0acba4a9199cb2f953be6b421d0bd (patch) | |
tree | 9ad68bc45ee86fb2f56b2f517013596f918538c9 /src/main/java/com/google/devtools/build/lib/rules/android | |
parent | 3e66b6e8163bdf49a65a02d422d109ffba170d26 (diff) |
Description redacted.
--
MOS_MIGRATED_REVID=105999401
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index b8e5a41000..2712eb298e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -55,7 +55,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaCompilationHelper; import com.google.devtools.build.lib.rules.java.JavaNativeLibraryProvider; -import com.google.devtools.build.lib.rules.java.JavaPluginInfoProvider; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; import com.google.devtools.build.lib.rules.java.JavaRuntimeJarProvider; import com.google.devtools.build.lib.rules.java.JavaSemantics; @@ -89,7 +88,6 @@ public class AndroidCommon { private NestedSet<Artifact> transitiveSourceJars = NestedSetBuilder.emptySet(Order.STABLE_ORDER); private JavaCompilationArgs javaCompilationArgs = JavaCompilationArgs.EMPTY_ARGS; private JavaCompilationArgs recursiveJavaCompilationArgs = JavaCompilationArgs.EMPTY_ARGS; - private JavaPluginInfoProvider transitiveJavaPluginInfoProvider = JavaPluginInfoProvider.EMPTY; private JackCompilationHelper jackCompilationHelper; private Artifact classJar; private Artifact iJar; @@ -538,16 +536,8 @@ public class AndroidCommon { topLevelSourceJars = ImmutableList.of(srcJar); transitiveSourceJars = javaCommon.collectTransitiveSourceJars(srcJar); - boolean hasSources = attributes.hasSourceFiles() || attributes.hasSourceJars(); - - if (!hasSources) { - // If this android rule has no sources, then it's a forwarding rule, so also forward - // any exported java plugins from its deps. - this.transitiveJavaPluginInfoProvider = JavaPluginInfoProvider.merge( - javaCommon.getPluginInfoProvidersForAttribute("deps", Mode.TARGET)); - } - if (collectJavaCompilationArgs) { + boolean hasSources = attributes.hasSourceFiles() || attributes.hasSourceJars(); this.javaCompilationArgs = collectJavaCompilationArgs(ruleContext, exportDeps, asNeverLink, hasSources); this.recursiveJavaCompilationArgs = collectJavaCompilationArgs( @@ -595,7 +585,6 @@ public class AndroidCommon { asNeverLink ? jackCompilationHelper.compileAsNeverlinkLibrary() : jackCompilationHelper.compileAsLibrary()) - .add(JavaPluginInfoProvider.class, transitiveJavaPluginInfoProvider) .addOutputGroup( OutputGroupProvider.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext)) .addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars); |