commit 20fc6090e75fd65916ce76a7cfef345ad29827ed
author Tamas Kenez <tamaskenez@google.com> Thu Mar 08 12:24:45 2018 +0100
committer Tamas Kenez <tamaskenez@google.com> Thu Mar 08 11:29:46 2018 +0000
tree cc7659976d779a5a4e60a21541ab8828dc1c7baf
parent 1a8ac23a67f062f4bfe5a573450d75653c850f32

Prevent writing double newline to end of Proguard-map.

Android Studio is sensitive to empty lines.

Bug: 74240422
Change-Id: Id5098cd5c8f2056777d839d60daa78f42f207731

src/main/java/com/android/tools/r8/StringConsumer.java

diff --git a/src/main/java/com/android/tools/r8/StringConsumer.java b/src/main/java/com/android/tools/r8/StringConsumer.java
index 543e8cd..9232e08 100644
--- a/src/main/java/com/android/tools/r8/StringConsumer.java
+++ b/src/main/java/com/android/tools/r8/StringConsumer.java
@@ -14,7 +14,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 
 /** Interface for receiving String resource. */
 public interface StringConsumer {
@@ -101,7 +100,7 @@
     public void accept(String string, DiagnosticsHandler handler) {
       super.accept(string, handler);
       try {
-        Files.write(outputPath, Collections.singletonList(string), encoding);
+        Files.write(outputPath, string.getBytes(encoding));
       } catch (IOException e) {
         handler.error(new IOExceptionDiagnostic(e, new PathOrigin(outputPath)));
       }