diff options
author | Lukacs Berki <lberki@google.com> | 2015-02-17 13:00:26 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-02-17 13:00:26 +0000 |
commit | c1f894e6e9d9aa3044dbe25034270e256c76c4ad (patch) | |
tree | c7c298fcd055906f138227df5173717d708dd734 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 8d356be3383021b8f91c584dd35e0813cf5ac2fe (diff) |
Add a new Blaze command.
--
MOS_MIGRATED_REVID=86483943
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
3 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index e957f49d84..b627657a0e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -236,7 +236,7 @@ public class JavaBinary implements RuleConfiguredTargetFactory { new JavaRuntimeClasspathProvider(common.getRuntimeClasspath())) .add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider(transitiveSourceJars, srcJars)) - .add(TopLevelArtifactProvider.class, new TopLevelArtifactProvider( + .add(TopLevelArtifactProvider.class, TopLevelArtifactProvider.of( JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars)) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java index f978f982d5..7de35768a3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.cpp.CcLinkParams; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider; @@ -133,7 +132,7 @@ public class JavaImport implements RuleConfiguredTargetFactory { .add(CppCompilationContext.class, transitiveCppDeps) .add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider( transitiveJavaSourceJars, srcJars)) - .add(TopLevelArtifactProvider.class, new TopLevelArtifactProvider( + .add(TopLevelArtifactProvider.class, TopLevelArtifactProvider.of( JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveJavaSourceJars)) .build(); } @@ -194,8 +193,4 @@ public class JavaImport implements RuleConfiguredTargetFactory { private Iterable<SourcesJavaCompilationArgsProvider> compilationArgsFromSources() { return ImmutableList.of(); } - - private ImmutableList<String> getJavaConstraints(RuleContext ruleContext) { - return ImmutableList.copyOf(ruleContext.attributes().get("constraints", Type.STRING_LIST)); - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java index 1831ef02ab..dd8de30836 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java @@ -229,7 +229,7 @@ public class JavaLibrary implements RuleConfiguredTargetFactory { transitiveJavaNativeLibraries)) .add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider( transitiveSourceJars, ImmutableList.of(srcJar))) - .add(TopLevelArtifactProvider.class, new TopLevelArtifactProvider( + .add(TopLevelArtifactProvider.class, TopLevelArtifactProvider.of( JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars)) // TODO(bazel-team): this should only happen for java_plugin .add(JavaPluginInfoProvider.class, new JavaPluginInfoProvider( |