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

1 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index e9a89c782c..87e3e97ca0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -2002,6 +2002,17 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
   }
 
   @Override
+  public Iterable<Label> getSanityCheckRoots() {
+    ImmutableList.Builder<Label> result = ImmutableList.builder();
+    result.add(cppOptions.crosstoolTop);
+    if (cppOptions.libcTop != null) {
+      result.add(cppOptions.libcTop.getLabel());
+    }
+
+    return result.build();
+  }
+
+  @Override
   public String getOutputDirectoryName() {
     String lipoSuffix;
     if (getLipoMode() != LipoMode.OFF && !isAutoFdoLipo()) {