Revert "[Retrace] Account for non-ascii std-in input"
This reverts commit 2e135f3426dcda6b36ace8d60c4d4b662047b66e.
Reason for revert: Broken on windows
Change-Id: I052b494fa0704eeb5a5fd106e4f8048136a43aae
diff --git a/src/main/java/com/android/tools/r8/retrace/Retrace.java b/src/main/java/com/android/tools/r8/retrace/Retrace.java
index b612ac0..af2b520 100644
--- a/src/main/java/com/android/tools/r8/retrace/Retrace.java
+++ b/src/main/java/com/android/tools/r8/retrace/Retrace.java
@@ -17,9 +17,7 @@
import com.android.tools.r8.utils.StringDiagnostic;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.Timing;
-import com.google.common.base.Charsets;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -212,7 +210,7 @@
}
private static List<String> getStackTraceFromStandardInput() {
- Scanner sc = new Scanner(new InputStreamReader(System.in, Charsets.UTF_8));
+ Scanner sc = new Scanner(System.in);
List<String> readLines = new ArrayList<>();
while (sc.hasNext()) {
readLines.add(sc.nextLine());
diff --git a/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java b/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
index 7dfc522..6fea76f 100644
--- a/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
+++ b/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
@@ -16,7 +16,6 @@
import com.android.tools.r8.retrace.Retrace;
import com.android.tools.r8.retrace.RetraceCommand;
import com.android.tools.r8.retrace.stacktraces.StackTraceForTest;
-import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
import junit.framework.TestCase;
@@ -33,8 +32,6 @@
return getTestParameters().withNoneRuntime().build();
}
- private static String SMILEY_EMOJI = "\uD83D\uDE00";
-
public RetraceTests(TestParameters parameters) {}
@Test
@@ -52,39 +49,6 @@
runRetraceTest(new VelvetStackTrace());
}
- @Test
- public void testNonAscii() {
- CronetStackTrace cronetStackTrace = new CronetStackTrace();
- runRetraceTest(
- new StackTraceForTest() {
- @Override
- public List<String> obfuscatedStackTrace() {
- ArrayList<String> smileyObf = new ArrayList<>();
- smileyObf.add(SMILEY_EMOJI);
- smileyObf.addAll(cronetStackTrace.obfuscatedStackTrace());
- return smileyObf;
- }
-
- @Override
- public String mapping() {
- return cronetStackTrace.mapping();
- }
-
- @Override
- public List<String> retracedStackTrace() {
- ArrayList<String> smileyObf = new ArrayList<>();
- smileyObf.add(SMILEY_EMOJI);
- smileyObf.addAll(cronetStackTrace.retracedStackTrace());
- return smileyObf;
- }
-
- @Override
- public int expectedWarnings() {
- return 0;
- }
- });
- }
-
private TestDiagnosticMessagesImpl runRetraceTest(StackTraceForTest stackTraceForTest) {
return runRetraceTest(stackTraceForTest, DEFAULT_REGULAR_EXPRESSION);
}
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java b/src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java
index 22e7820..e8494d6 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java
@@ -125,16 +125,6 @@
assertEquals(Retrace.USAGE_MESSAGE, processResult.stdout);
}
- @Test
- public void testNonAscii() throws IOException {
- runTest("", "\uD83D\uDE00", false, "\uD83D\uDE00" + StringUtils.LINE_SEPARATOR);
- }
-
- @Test
- public void testNonAsciiStdIn() throws IOException {
- runTest("", "\uD83D\uDE00", true, "\uD83D\uDE00" + StringUtils.LINE_SEPARATOR);
- }
-
private final String nonMappableStackTrace =
StringUtils.lines(
"com.android.r8.R8Exception: Problem when compiling program",
