commit 28bf60bd586ae0ae31ba4e848b2116a013813b41
author Christoffer Adamsen <christofferqa@google.com> Tue Jun 03 10:32:06 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Tue Jun 03 04:07:13 2025 -0700
tree b62a4e3897320cab12ee923d9d53ed84e6ca3a4f
parent b10a41fc28cb794a3b96588402b698a95d179462

Update DataResourceConsumerForTesting to use unix based line separator

Change-Id: Ie31f490535a92c7aebf1c130fcf40a0444ce2b53

src/main/java/com/android/tools/r8/utils/StringUtils.java

diff --git a/src/main/java/com/android/tools/r8/utils/StringUtils.java b/src/main/java/com/android/tools/r8/utils/StringUtils.java
index 43a8d07..c0f2cbc 100644
--- a/src/main/java/com/android/tools/r8/utils/StringUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/StringUtils.java
@@ -28,6 +28,7 @@
   public static char[] EMPTY_CHAR_ARRAY = {};
   public static final String[] EMPTY_ARRAY = {};
   public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+  public static final String UNIX_LINE_SEPARATOR = "\n";
   public static final char BOM = '\uFEFF';
 
   public enum BraceType {
@@ -255,7 +256,7 @@
   }
 
   public static String unixLines(List<String> lines) {
-    return lines(lines, "\n");
+    return lines(lines, UNIX_LINE_SEPARATOR);
   }
 
   public static String withNativeLineSeparator(String s) {

src/test/java/com/android/tools/r8/utils/DataResourceConsumerForTesting.java

diff --git a/src/test/java/com/android/tools/r8/utils/DataResourceConsumerForTesting.java b/src/test/java/com/android/tools/r8/utils/DataResourceConsumerForTesting.java
index b4a7e41..c1b3522 100644
--- a/src/test/java/com/android/tools/r8/utils/DataResourceConsumerForTesting.java
+++ b/src/test/java/com/android/tools/r8/utils/DataResourceConsumerForTesting.java
@@ -4,6 +4,7 @@
 
 package com.android.tools.r8.utils;
 
+import static com.android.tools.r8.utils.StringUtils.UNIX_LINE_SEPARATOR;
 import static org.junit.Assert.assertFalse;
 
 import com.android.tools.r8.DataDirectoryResource;
@@ -42,7 +43,7 @@
     try {
       byte[] bytes = ByteStreams.toByteArray(file.getByteStream());
       String contents = new String(bytes, Charset.defaultCharset());
-      resources.put(file.getName(), ImmutableList.copyOf(contents.split(System.lineSeparator())));
+      resources.put(file.getName(), ImmutableList.copyOf(contents.split(UNIX_LINE_SEPARATOR)));
     } catch (Exception e) {
       throw new RuntimeException(e);
     }