Make the creation of the external package much simpler.

A previous change made the loading-time external label resolution unused, thus, now we can do away with a lot of machinery. The only unfortunate side effect is that instead of a nice and clear "No Android SDK found" error message, you'll get a more cryptic "external label //external:android/sdk is unbound" one. I think it's a fair tradeoff.

--
MOS_MIGRATED_REVID=98813719

1 files changed, 0 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index fa770b073b..59d864a826 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.packages.ExternalPackage.Builder;
-import com.google.devtools.build.lib.packages.ExternalPackage.Builder.NoSuchBindingException;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
 import com.google.devtools.build.lib.packages.WorkspaceFactory;
@@ -76,15 +75,6 @@ public class WorkspaceFileFunction implements SkyFunction {
       throw new WorkspaceFileFunctionException(e, Transience.TRANSIENT);
     }
 
-    try {
-      builder.resolveBindTargets(packageFactory.getRuleClass("bind"));
-    } catch (NoSuchBindingException e) {
-      throw new WorkspaceFileFunctionException(
-          new EvalException(e.getLocation(), e.getMessage()));
-    } catch (EvalException e) {
-      throw new WorkspaceFileFunctionException(e);
-    }
-
     return new PackageValue(builder.build());
   }