Do not load the transitive closure of the Android SDK on every build.

This makes the sanity check dependent on the configuration fragments returning proper roots, but it's not that bad because it already depends on them returning the proper set of implicit labels and #getImplicitLabels() will go away soon anyway.

--
MOS_MIGRATED_REVID=131705535

2 files changed, 0 insertions, 53 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index de63f18eac..888f9d4c0f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1034,27 +1034,6 @@ public class BuildViewTest extends BuildViewTestBase {
   }
 
   @Test
-  public void testMissingLabelInConfiguration() throws Exception {
-    scratch.file("nobuild/BUILD",
-        "cc_library(name= 'lib')");
-    useConfiguration("--experimental_action_listener=//nobuild:bar");
-    reporter.removeHandler(failFastHandler);
-    String begin = String.format(
-        "Failed to load required %s target: '%s'", "action_listener", "//nobuild:bar");
-    try {
-      update(defaultFlags().with(Flag.KEEP_GOING), "//nobuild:lib");
-      fail();
-    } catch (InvalidConfigurationException e) {
-      // Interleaved loading and analysis - loading errors are found during configuration creation.
-      assertThat(e.getMessage()).startsWith(begin);
-    } catch (LoadingFailedException e) {
-      assertThat(e.getMessage()).startsWith(begin);
-    }
-    assertContainsEventWithFrequency(
-        "no such target '//nobuild:bar': target 'bar' not declared in package 'nobuild'", 1);
-  }
-
-  @Test
   public void testBadLabelInConfiguration() throws Exception {
     useConfiguration("--crosstool_top=//third_party/crosstool/v2");
     reporter.removeHandler(failFastHandler);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 882606f314..1f3a83d5b2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -20,7 +20,6 @@ import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.baseArt
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.baseNamesOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
@@ -33,7 +32,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.OutputGroupProvider;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFactory;
-import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.mock.BazelAnalysisMock;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -824,36 +822,6 @@ public class CcCommonTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testExplicitBadStl() throws Exception {
-    scratch.file("x/BUILD");
-
-    reporter.removeHandler(failFastHandler);
-    try {
-      createConfigurations("--experimental_stl=//x:blah");
-      fail("found non-existing target");
-    } catch (InvalidConfigurationException expected) {
-      assertThat(expected.getMessage()).contains("Failed to load required STL target: '//x:blah'");
-    }
-
-    try {
-      createConfigurations("--experimental_stl=//blah");
-      fail("found non-existing target");
-    } catch (InvalidConfigurationException expected) {
-      assertThat(expected.getMessage())
-          .contains("Failed to load required STL target: '//blah:blah'");
-    }
-
-    // Without -k.
-    try {
-      createConfigurations("--experimental_stl=//blah");
-      fail("found non-existing target");
-    } catch (InvalidConfigurationException expected) {
-      assertThat(expected.getMessage())
-          .contains("Failed to load required STL target: '//blah:blah'");
-    }
-  }
-
-  @Test
   public void testLibraryInHdrs() throws Exception {
     scratchConfiguredTarget("a", "a",
         "cc_library(name='a', srcs=['a.cc'], hdrs=[':b'])",