Automated g4 rollback of commit cbbb423663b154d82e3dfa5e9a56839583987999.

*** Reason for rollback ***

Need to roll this back as part of http://b/38171368

*** Original change description ***

RELNOTES: Effectively remove sysroot from CppConfiguration and allow it to use select statements.
PiperOrigin-RevId: 155547813

1 files changed, 1 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
index 1844609dd1..f35954589d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -82,8 +82,6 @@ public class FakeCppCompileAction extends CppCompileAction {
       Iterable<IncludeScannable> lipoScannables,
       Iterable<Artifact> builtinIncludeFiles,
       CppSemantics cppSemantics,
-      ImmutableList<String> unfilteredCompilerOptions,
-      ImmutableList<PathFragment> builtInIncludeDirectories,
       ImmutableMap<String, String> executionInfo) {
     super(
         owner,
@@ -126,9 +124,7 @@ public class FakeCppCompileAction extends CppCompileAction {
         ImmutableMap.<String, String>of(),
         CppCompileAction.CPP_COMPILE,
         builtinIncludeFiles,
-        cppSemantics,
-        unfilteredCompilerOptions,
-        builtInIncludeDirectories);
+        cppSemantics);
     this.tempOutputFile = Preconditions.checkNotNull(tempOutputFile);
   }