Write the marker string to all files in files-per-class mode
This fixes an number of failing tests.
Change-Id: I317f9f56accf7d4a65cbcfbca2e7667c8e4e3479
diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index cbca177..f06aa45 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -231,6 +231,11 @@
for (DexProgramClass clazz : application.classes()) {
VirtualFile file = new VirtualFile(nameToFileMap.size(), writer.namingLens);
nameToFileMap.put(nameToFileMap.size(), file);
+ // Write the marker string to all files in files-per-class mode.
+ // TODO(sgjesse): Get rid of this (currently some tests fails without it).
+ if (writer.markerString != null) {
+ file.transaction.addString(writer.markerString);
+ }
file.addClass(clazz);
file.commitTransaction();
}