Console output: switch to file line ending

As nobody uses bazel on a traditional teletyper terminal, we
can as well use the line ending of native files instead of
terminal/network line endings. While the console output is not
meant to be handled by anything but a terminal, this still seems
to be done.

Change-Id: Ied745eeedaec70572ef4b3a3c716a0cf57dfdfd1
PiperOrigin-RevId: 207511649

2 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
index 8285284711..f68b3853d2 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
@@ -866,9 +866,9 @@ public class ExperimentalEventHandler implements EventHandler {
     numLinesProgressBar = 0;
   }
 
+  /** Terminate the line in the way appropriate for the operating system. */
   private void crlf() throws IOException {
-    terminal.cr();
-    terminal.writeString("\n");
+    terminal.writeString(System.lineSeparator());
   }
 
   private synchronized void addProgressBar() throws IOException {
diff --git a/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java b/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java
index ff3d8c4e98..862472a9d0 100644
--- a/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java
+++ b/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java
@@ -37,8 +37,7 @@ public class LineCountingAnsiTerminalWriter implements AnsiTerminalWriter {
 
   @Override
   public AnsiTerminalWriter newline() throws IOException {
-    terminal.cr();
-    terminal.writeString("\n");
+    terminal.writeString(System.lineSeparator());
     lineCount++;
     return this;
   }