diff options
author | Lukacs Berki <lberki@google.com> | 2015-08-20 12:35:19 +0000 |
---|---|---|
committer | Lukacs Berki <lberki@google.com> | 2015-08-20 14:50:12 +0000 |
commit | b24b1c491456980d2cd7e505204be1816d83bbea (patch) | |
tree | f0890014e523c221606d46c4d5f1ea5d822e3797 /src/main/java/com/google/devtools | |
parent | 59967eddd100dec8664b53c53a1c1d9380295201 (diff) |
A minor refactoring of JavaSemantics.
--
MOS_MIGRATED_REVID=101113563
Diffstat (limited to 'src/main/java/com/google/devtools')
3 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index b5a3e240d6..ebf472d150 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; @@ -135,7 +134,7 @@ public class BazelJavaSemantics implements JavaSemantics { @Override public Artifact createInstrumentationMetadataArtifact( - AnalysisEnvironment analysisEnvironment, Artifact outputJar) { + RuleContext ruleContext, Artifact outputJar) { return null; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java index d426d2bea6..818e12c646 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java @@ -179,7 +179,7 @@ public class JavaCompilationHelper extends BaseJavaCompilationHelper { Artifact instrumentationMetadata = null; if (shouldInstrumentJar()) { instrumentationMetadata = semantics.createInstrumentationMetadataArtifact( - getAnalysisEnvironment(), outputJar); + getRuleContext(), outputJar); if (instrumentationMetadata != null) { javaArtifactsBuilder.addInstrumentationMetadata(instrumentationMetadata); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index 7924e2c9b5..b582bd9245 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -19,7 +19,6 @@ import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fro import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.LanguageDependentFragment.LibraryLanguage; import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; @@ -213,8 +212,8 @@ public interface JavaSemantics { /** * Creates the instrumentation metadata artifact for the specified output .jar . */ - @Nullable Artifact createInstrumentationMetadataArtifact( - AnalysisEnvironment analysisEnvironment, Artifact outputJar); + @Nullable + Artifact createInstrumentationMetadataArtifact(RuleContext ruleContext, Artifact outputJar); /** * Returns the instrumentation libraries (jars) for the given context. |