Use reader instead of buffered reader in ProguardMapSupplier
Bug: 183706169
Change-Id: I4914945266aedd82db2338d22a6509d90be6db1d
diff --git a/src/main/java/com/android/tools/r8/retrace/ProguardMapProducer.java b/src/main/java/com/android/tools/r8/retrace/ProguardMapProducer.java
index de17e85..81b7f30 100644
--- a/src/main/java/com/android/tools/r8/retrace/ProguardMapProducer.java
+++ b/src/main/java/com/android/tools/r8/retrace/ProguardMapProducer.java
@@ -5,10 +5,9 @@
package com.android.tools.r8.retrace;
import com.android.tools.r8.Keep;
-import com.google.common.io.CharSource;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -17,14 +16,10 @@
@Keep
public interface ProguardMapProducer {
- BufferedReader get() throws IOException;
+ Reader get() throws IOException;
static ProguardMapProducer fromString(String proguardMapString) {
- return () -> CharSource.wrap(proguardMapString).openBufferedStream();
- }
-
- static ProguardMapProducer fromReader(Reader reader) {
- return () -> new BufferedReader(reader);
+ return () -> new StringReader(proguardMapString);
}
static ProguardMapProducer fromPath(Path path) {
diff --git a/src/main/java/com/android/tools/r8/retrace/internal/RetracerImpl.java b/src/main/java/com/android/tools/r8/retrace/internal/RetracerImpl.java
index 897e848..03f515b 100644
--- a/src/main/java/com/android/tools/r8/retrace/internal/RetracerImpl.java
+++ b/src/main/java/com/android/tools/r8/retrace/internal/RetracerImpl.java
@@ -13,6 +13,7 @@
import com.android.tools.r8.retrace.InvalidMappingFileException;
import com.android.tools.r8.retrace.ProguardMapProducer;
import com.android.tools.r8.retrace.Retracer;
+import java.io.BufferedReader;
/** A default implementation for the retrace api using the ClassNameMapper defined in R8. */
public class RetracerImpl implements Retracer {
@@ -33,7 +34,7 @@
try {
ClassNameMapper classNameMapper =
ClassNameMapper.mapperFromBufferedReader(
- proguardMapProducer.get(), diagnosticsHandler, true);
+ new BufferedReader(proguardMapProducer.get()), diagnosticsHandler, true);
return new RetracerImpl(classNameMapper);
} catch (Throwable throwable) {
throw new InvalidMappingFileException(throwable);
