commit ce68ee7dcfaa303248808ad9a72339c85ca87405
author hlopko <hlopko@google.com> Fri Sep 28 07:03:05 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Sep 28 07:04:39 2018 -0700
tree bb92f8c6bfd6bc2fc80b763e14b307544c040580
parent 875cc912ac95c3f4774808fe10fd122ee51b0fd3

Automated rollback of commit be4a0679a35d2881a9e93ae4a5ee4c88c536f232.

*** Reason for rollback ***

b/116815956

*** Original change description ***

Make cc rules depend on the crosstool middleman, not on nested set of inputs

This will save some memory coming from back skyframe edges for hermetic C++ toolchains and objc rules.

RELNOTES: None.
PiperOrigin-RevId: 214930312

src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
index e42cc3a..b3e4434 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -43,7 +43,7 @@
     actionBuilder
         // Because Bazel does not support include scanning, we need the entire crosstool filegroup,
         // including header files, as opposed to just the "compile" filegroup.
-        .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstoolMiddleman())
+        .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstool())
         .setShouldScanIncludes(false);
   }
 

src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
index ff86c5d..59b560a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
@@ -41,7 +41,7 @@
       CcToolchainProvider provider =
           (CcToolchainProvider) dep.get(ToolchainInfo.PROVIDER);
       if (provider != null) {
-        filesToBuild.addTransitive(provider.getCrosstoolMiddleman());
+        filesToBuild.addTransitive(provider.getCrosstool());
       }
     }
 

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
index 9c29778..9ecad90 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
@@ -91,7 +91,7 @@
     actionBuilder
         // Because Bazel does not support include scanning, we need the entire crosstool filegroup,
         // including header files, as opposed to just the "compile" filegroup.
-        .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstoolMiddleman())
+        .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstool())
         .setShouldScanIncludes(false)
         .addTransitiveMandatoryInputs(objcProvider.get(STATIC_FRAMEWORK_FILE))
         .addTransitiveMandatoryInputs(objcProvider.get(DYNAMIC_FRAMEWORK_FILE));