Update debug stripping tests for Dalvik 4.4.4.
This should be the last change and we should be able to add 4.4.4 to the
buildbots. Then we need to look into getting the debugger tests covered
there as well. Sebastien filed a bug report on that part.
R=sgjesse@google.com, shertz@google.com
Change-Id: If983aaa7412f1abd4930600061c6204fa99a25e6
diff --git a/src/test/java/com/android/tools/r8/optimize/R8DebugStrippingTest.java b/src/test/java/com/android/tools/r8/optimize/R8DebugStrippingTest.java
index 1426a0f..6609ff2 100644
--- a/src/test/java/com/android/tools/r8/optimize/R8DebugStrippingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/R8DebugStrippingTest.java
@@ -12,6 +12,7 @@
import com.android.tools.r8.CompilationException;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.graph.DexCode;
import com.android.tools.r8.graph.DexString;
import com.android.tools.r8.naming.ClassNameMapper;
@@ -28,7 +29,6 @@
import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
-import com.google.common.io.Closer;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
@@ -177,6 +177,10 @@
private String extractRangeIndex(String line, ClassNameMapper mapper) {
int position = line.lastIndexOf(EXAMPLE_JAVA);
+ if (position == -1 && ToolHelper.getDexVm() == DexVm.ART_4_4_4) {
+ assert line.contains("dalvik.system.NativeStart.main(Native Method)");
+ return "Native Method";
+ }
assertNotSame("Malformed stackframe: " + line, -1, position);
String numberPart = line.substring(position + EXAMPLE_JAVA.length() + 1, line.lastIndexOf(')'));
int number = Integer.parseInt(numberPart);