Rollback of commit a708acd02baf3821c975801ae0e5cad6867a6735.

*** Reason for rollback ***

--
MOS_MIGRATED_REVID=102590114

1 files changed, 2 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
index a7e3a1a1da..655dcd5f1a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
@@ -59,12 +59,11 @@ public final class CppFileTypes {
       final String ext = ".s";
       @Override
       public boolean apply(String filename) {
-        return (filename.endsWith(ext) && !PIC_ASSEMBLER.matches(filename))
-               || filename.endsWith(".asm");
+        return filename.endsWith(ext) && !PIC_ASSEMBLER.matches(filename);
       }
       @Override
       public List<String> getExtensions() {
-        return ImmutableList.of(ext, ".asm");
+        return ImmutableList.of(ext);
       }
     };
 
@@ -140,8 +139,4 @@ public final class CppFileTypes {
 
   // Output of the dwp tool
   public static final FileType DEBUG_INFO_PACKAGE = FileType.of(".dwp");
-
-  public static final boolean mustProduceDotdFile(String source) {
-    return !(ASSEMBLER.matches(source) || PIC_ASSEMBLER.matches(source));
-  }
 }