[Compose] Do not compose new file name information for existing class
Bug: b/286023274
Change-Id: I352a1617cfce6cdda11a51b0fd00429517ea2c52
diff --git a/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java b/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
index d87e036..502f120 100644
--- a/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
+++ b/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
@@ -1306,7 +1306,7 @@
}
newMappingInformation.forEach(
info -> {
- if (!nonCompasableNewInfos.contains(info)) {
+ if (!nonCompasableNewInfos.contains(info) && !info.isFileNameInformation()) {
consumer.accept(info);
}
});
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
index d155375..434c494 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeSourceFileTest.java
@@ -53,8 +53,6 @@
"com.bar -> b:",
"# {'id':'sourceFile','fileName':'Bar.kt'}",
"com.baz -> c:",
- // TODO(b/286023274): We should not insert 'sourceFile' on composed classes.
- "# {'id':'sourceFile','fileName':'some-other-hash-inserted-into-source-file'}",
"com.foo -> a:",
"# {'id':'sourceFile','fileName':'Foo.kt'}",
"com.qux -> d:",
