commit 76cb02e5a95f7a854eabe3221c366ea804696b17
author Lukacs Berki <lberki@google.com> Fri Feb 17 14:06:11 2017 +0000
committer Dmitry Lomov <dslomov@google.com> Fri Feb 17 14:56:48 2017 +0000
tree 26fe8a4ce883d15af65f8fa3019242ed7424fcbf
parent 5d2ae52c032203575f145ca409f2b86f1e8c700b

Make the interface dynamic library builder a regular label instead of a magic artifact.

--
PiperOrigin-RevId: 147830857
MOS_MIGRATED_REVID=147830857

src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index 5aed23d..7a768c9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
@@ -26,7 +26,6 @@
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoCollection;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey;
-import com.google.devtools.build.lib.analysis.config.BinTools;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
@@ -82,7 +81,6 @@
   private EventHandler errorEventListener;
   private SkyFunction.Environment skyframeEnv;
   private Map<Artifact, String> artifacts;
-  private final BinTools binTools;
 
   /**
    * The list of actions registered by the configured target this analysis environment is
@@ -92,8 +90,8 @@
 
   public CachingAnalysisEnvironment(ArtifactFactory artifactFactory,
       ArtifactOwner owner, boolean isSystemEnv, boolean extendedSanityChecks,
-      EventHandler errorEventListener, SkyFunction.Environment env, boolean allowRegisteringActions,
-      BinTools binTools) {
+      EventHandler errorEventListener, SkyFunction.Environment env,
+      boolean allowRegisteringActions) {
     this.artifactFactory = artifactFactory;
     this.owner = Preconditions.checkNotNull(owner);
     this.isSystemEnv = isSystemEnv;
@@ -101,7 +99,6 @@
     this.errorEventListener = errorEventListener;
     this.skyframeEnv = env;
     this.allowRegisteringActions = allowRegisteringActions;
-    this.binTools = Preconditions.checkNotNull(binTools);
     middlemanFactory = new MiddlemanFactory(artifactFactory, this);
     artifacts = new HashMap<>();
   }
@@ -250,12 +247,6 @@
   }
 
   @Override
-  public Artifact getEmbeddedToolArtifact(String embeddedPath) {
-    Preconditions.checkState(enabled);
-    return binTools.getEmbeddedArtifact(embeddedPath, artifactFactory);
-  }
-
-  @Override
   public void registerAction(ActionAnalysisMetadata... actions) {
     Preconditions.checkState(enabled);
     if (allowRegisteringActions) {