Rollback of commit 99de0d07574f808fee36826289cb1f5c83e3b3e0.

*** Reason for rollback ***

Makes blaze unable to build //third_party/stl
IllegalArgumentException: complex.h.processed
  at com.google.common.base.Preconditions.checkArgument(Preconditions.java:127)
  at com.google.devtools.build.lib.util.Preconditions.checkArgument(Preconditions.java:38)
  at com.google.devtools.build.lib.rules.cpp.CppLinkActionBuilder.addObjectFile(CppLinkActionBuilder.java:831)

NOT a clean rollback; conflict in one file (CppCompilationContext.java).
So this also partially rolls back commit 603b540bbcd7414cd3e2c0b92c1c8985b035e41b (just the change in that file).

*** Original change description ***

Cleanup: store non-code inputs to link actions separately.

--
MOS_MIGRATED_REVID=129798636

1 files changed, 1 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
index d0cd8dfece..b7f0300adb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.util.Preconditions;
+
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -200,15 +200,11 @@ public class CcCompilationOutputs {
      * Adds an .o file.
      */
     public Builder addObjectFile(Artifact artifact) {
-      Preconditions.checkArgument(Link.OBJECT_FILETYPES.matches(artifact.getFilename()));
       objectFiles.add(artifact);
       return this;
     }
 
     public Builder addObjectFiles(Iterable<Artifact> artifacts) {
-      for (Artifact artifact : artifacts) {
-        Preconditions.checkArgument(Link.OBJECT_FILETYPES.matches(artifact.getFilename()));
-      }
       Iterables.addAll(objectFiles, artifacts);
       return this;
     }