Fix bad merge of kotlin keep package change
Change-Id: Ia7b7c3bcac6838444efd8f3714e4ab8c12351eee
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinClassMetadataReader.java b/src/main/java/com/android/tools/r8/kotlin/KotlinClassMetadataReader.java
index 541db7e..5fe02b2 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinClassMetadataReader.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinClassMetadataReader.java
@@ -106,6 +106,7 @@
DexDefinitionSupplier definitionSupplier,
Reporter reporter,
Consumer<DexEncodedMethod> keepByteCode) {
+ String packageName = kMetadata.getHeader().getPackageName();
if (kMetadata instanceof KotlinClassMetadata.Class) {
return KotlinClassInfo.create(
((KotlinClassMetadata.Class) kMetadata).toKmClass(),
@@ -131,8 +132,8 @@
// A single file, which is part of multi-file class.
return KotlinMultiFileClassPartInfo.create(
(KotlinClassMetadata.MultiFileClassPart) kMetadata,
- clazz,
packageName,
+ clazz,
definitionSupplier,
reporter,
keepByteCode);
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
index feb526c..77f21ad 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
@@ -72,7 +72,6 @@
KotlinClassHeader rewrittenHeader = rewrittenMetadata.getHeader();
assertEquals(originalHeader.getKind(), rewrittenHeader.getKind());
// TODO(b/154199572): Should we check for meta-data version?
- // TODO(b/156290606): Check if we should assert the package names are equal.
assertEquals(originalHeader.getPackageName(), rewrittenHeader.getPackageName());
// We cannot assert equality of the data since it may be ordered differently. Instead we use
// the KotlinMetadataWriter.
