commit 25687c1b80e0f3f5575eeaf07176948e8feee6b6
author Søren Gjesse <sgjesse@google.com> Mon Jun 19 16:27:47 2017 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 19 16:27:47 2017 +0200
tree fa8cca346516d1d570e9e45f95eacfc12a5dc38d
parent 2bb5939c3cc0a08246a94a494a09b8eb5ca086e6

Fix bug in the class to file assignment

R=ager@google.com

Change-Id: Idd16473362d2164426c25558340cf8357f3475c1

src/main/java/com/android/tools/r8/dex/VirtualFile.java

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 a03adfb..c87c34d 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -298,7 +298,7 @@
 
       new PackageSplitPopulator(
           nameToFileMap, classes, originalNames, null, application.dexItemFactory,
-          false, writer.namingLens)
+          true, writer.namingLens)
           .call();
       return nameToFileMap;
     }
@@ -345,7 +345,7 @@
         newAssignments =
             new PackageSplitPopulator(
                 nameToFileMap, classes, originalNames, usedPrefixes, application.dexItemFactory,
-                true, writer.namingLens)
+                false, writer.namingLens)
                 .call();
         if (!newAssignments.isEmpty() && nameToFileMap.size() > 1) {
           System.err.println(" * The used package map is missing entries. The following default "