Skip to content

Prevent DexFileSplitter from dropping colliding class names #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oscarthecat wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −1
Open

Prevent DexFileSplitter from dropping colliding class names #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/tools/java/com/google/devtools/build/android/dexer/ZipEntryComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public int compare(ZipEntry a, ZipEntry b) {
// Copied from com.android.dx.cf.direct.ClassPathOpener
@VisibleForTesting
static int compareClassNames(String a, String b) {
String originalA = a;
String originalB = b;

// Ensure inner classes sort second
a = a.replace('$', '0');
b = b.replace('$', '0');
Expand All @@ -55,6 +58,13 @@ static int compareClassNames(String a, String b) {
a = a.replace("package-info", "");
b = b.replace("package-info", "");

return a.compareTo(b);
int normalizedResult = a.compareTo(b);
if (normalizedResult != 0) {
return normalizedResult;
}

// Normalization is lossy. Keep distinct raw names distinct when this comparator is used as a
// TreeMap key comparator, otherwise entries such as Foo$2$1$1 and Foo$2$101 collapse.
return originalA.compareTo(originalB);
}
}
14 changes: 14 additions & 0 deletions src/tools/javatests/com/google/devtools/build/android/dexer/DexFileSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.nio.file.Path;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ExecutionException;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
Expand Down Expand Up @@ -123,6 +124,19 @@ public void testDuplicateInputIgnored() throws Exception {
assertThat(dexEntries(outputArchives.get(0))).containsExactlyElementsIn(expectedFiles);
}

@Test
public void testClassNameComparatorPreservesNormalizationCollisions() {
TreeMap<String, Boolean> classNames =
new TreeMap<>(ZipEntryComparator::compareClassNames);

classNames.put("Foo$2$1$1.class.dex", true);
classNames.put("Foo$2$101.class.dex", true);

assertThat(classNames.keySet())
.containsExactly("Foo$2$1$1.class.dex", "Foo$2$101.class.dex")
.inOrder();
}

@Test
public void testSingleInputMultidexOutput() throws Exception {
ImmutableList<Path> outputArchives =
Expand Down