[Retrace] Remove references to StringUtils in binary test
Change-Id: Idac9a93b9f3109aeb17071c3f8453ba6e32ed521
diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java b/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java
index 5183bf6..016cf49 100644
--- a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java
@@ -12,7 +12,6 @@
import com.android.tools.r8.retrace.MappingPartitionMetadata;
import com.android.tools.r8.retrace.ProguardMapPartitioner;
import com.android.tools.r8.retrace.ProguardMapProducer;
-import com.android.tools.r8.utils.StringUtils;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -36,23 +35,20 @@
public static class ApiTest implements RetraceApiBinaryTest {
private final String aMapping =
- StringUtils.joinLines(
- "com.foo.bar.baz -> a:",
- "# someCommentHere",
- " int field -> c",
- " void method() -> d");
+ "com.foo.bar.baz -> a:\n"
+ + "# someCommentHere\n"
+ + " int field -> c\n"
+ + " void method() -> d";
private final String bMapping =
- StringUtils.joinLines(
- "com.android.google.r8 -> b:",
- " boolean otherField -> e",
- " int otherMethod() -> f",
- "# otherCommentHere");
+ "com.android.google.r8 -> b:\n"
+ + " boolean otherField -> e\n"
+ + " int otherMethod() -> f\n"
+ + "# otherCommentHere";
- private final String header =
- StringUtils.lines("# { id: 'com.android.tools.r8.mapping', version: '2.0' }");
+ private final String header = "# { id: 'com.android.tools.r8.mapping', version: '2.0' }";
- private final String mapping = header + aMapping + StringUtils.LINE_SEPARATOR + bMapping;
+ private final String mapping = header + "\n" + aMapping + "\n" + bMapping;
@Test
public void test() throws IOException {
diff --git a/third_party/retrace/binary_compatibility.tar.gz.sha1 b/third_party/retrace/binary_compatibility.tar.gz.sha1
index 0325801..f5a5521 100644
--- a/third_party/retrace/binary_compatibility.tar.gz.sha1
+++ b/third_party/retrace/binary_compatibility.tar.gz.sha1
@@ -1 +1 @@
-e9a51bfcb895db2b47c64004dd94acb2356a84a4
\ No newline at end of file
+3aa48c8d23b8ae1e1c51c91ef8c73f7bc7cb4657
\ No newline at end of file
