commit 2462cc5b887078887be6dd0a071e3c8b30ec2703
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Jul 23 09:51:50 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Jul 23 09:51:50 2018 +0200
tree 32e2b0ae90603fb53245b70be6f1b17b59cc7095
parent eb68767befd1dd727dfed32aa2f1c293984cb9e6

Sort classes by original name in Proguard map

Change-Id: I52425ae3400d846cdee5239ed3caed0bcf462efd

src/main/java/com/android/tools/r8/naming/ClassNameMapper.java

diff --git a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
index 5b908af..c5d366a 100644
--- a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
+++ b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
@@ -25,7 +25,10 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -150,7 +153,12 @@
   }
 
   public void write(Writer writer) throws IOException {
-    for (ClassNamingForNameMapper naming : classNameMappings.values()) {
+    // Sort classes by their original name such that the generated Proguard map is deterministic
+    // (and easy to navigate manually).
+    List<ClassNamingForNameMapper> classNamingForNameMappers =
+        new ArrayList<>(classNameMappings.values());
+    classNamingForNameMappers.sort(Comparator.comparing(x -> x.originalName));
+    for (ClassNamingForNameMapper naming : classNamingForNameMappers) {
       naming.write(writer);
     }
   }