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, 2 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index c0f7908d1c..dff91d6976 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -249,14 +248,8 @@ final class ConfiguredTargetFunction implements SkyFunction {
       Dependency dep = entry.getValue();
       SkyKey depKey = TO_KEYS.apply(dep);
       ConfiguredTarget depConfiguredTarget = depConfiguredTargetMap.get(depKey);
-      Verify.verify(depConfiguredTarget != null);
-      if (depConfiguredTarget.getTarget() != null) {
-        // This condition will be false if this is a //external label defined by a bind() rule
-        // without an actual= attribute. In this case, we pretend that the dependency does not
-        // exist.
-        result.put(entry.getKey(),
-            RuleConfiguredTarget.mergeAspects(depConfiguredTarget, depAspectMap.get(depKey)));
-      }
+      result.put(entry.getKey(),
+          RuleConfiguredTarget.mergeAspects(depConfiguredTarget, depAspectMap.get(depKey)));
     }
 
     return result;