commit f17e5ecf22cbb570fd0db095152315878f733bb8
author David Reiss <dreiss@fb.com> Thu Oct 03 13:26:56 2013 -0700
committer Michael Bolin <mbolin@fb.com> Tue Oct 08 13:55:07 2013 -0700
tree 96dcc06473cf361f525ac1307ea7e16aca748b31
parent e5ecfef5d373c3369c75e09256f263713f8d31e4

Enable minimizing the primary dex with DalvikAwareZipSplitter.

src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java

diff --git a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java
index 1ca824c..fe19011 100644
--- a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java
+++ b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitter.java
@@ -52,6 +52,7 @@
   private final File reportDir;
   private final long linearAllocLimit;
   private final DalvikStatsCache dalvikStatsCache;
+  private final DexSplitStrategy dexSplitStrategy;
 
   private final MySecondaryDexHelper secondaryDexWriter;
   private DalvikAwareOutputStreamHelper primaryOut;
@@ -66,6 +67,7 @@
       String secondaryPattern,
       long linearAllocLimit,
       Predicate<String> requiredInPrimaryZip,
+      DexSplitStrategy dexSplitStrategy,
       ZipSplitter.CanaryStrategy canaryStrategy,
       File reportDir) {
     if (linearAllocLimit <= 0) {
@@ -76,6 +78,7 @@
     this.secondaryDexWriter = new MySecondaryDexHelper(outSecondaryDir, secondaryPattern, canaryStrategy);
     this.requiredInPrimaryZip = Preconditions.checkNotNull(requiredInPrimaryZip);
     this.reportDir = reportDir;
+    this.dexSplitStrategy = Preconditions.checkNotNull(dexSplitStrategy);
     this.linearAllocLimit = linearAllocLimit;
     this.dalvikStatsCache = new DalvikStatsCache();
   }
@@ -87,6 +90,7 @@
       String secondaryPattern,
       long linearAllocLimit,
       Predicate<String> requiredInPrimaryZip,
+      DexSplitStrategy dexSplitStrategy,
       ZipSplitter.CanaryStrategy canaryStrategy,
       File reportDir) {
     return new DalvikAwareZipSplitter(
@@ -96,6 +100,7 @@
         secondaryPattern,
         linearAllocLimit,
         requiredInPrimaryZip,
+        dexSplitStrategy,
         canaryStrategy,
         reportDir);
   }
@@ -130,7 +135,8 @@
 
         // Even if we have started writing a secondary dex, we still check if there is any leftover
         // room in the primary dex for the current entry in the traversal.
-        if (primaryOut.canPutEntry(entry)) {
+        if (dexSplitStrategy == DexSplitStrategy.MAXIMIZE_PRIMARY_DEX_SIZE &&
+            primaryOut.canPutEntry(entry)) {
           primaryOut.putEntry(entry);
         } else {
           secondaryDexWriter.getOutputToWriteTo(entry).putEntry(entry);

src/com/facebook/buck/dalvik/DalvikAwareZipSplitterFactory.java

diff --git a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitterFactory.java b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitterFactory.java
index 9abdf70..7c07a47c 100644
--- a/src/com/facebook/buck/dalvik/DalvikAwareZipSplitterFactory.java
+++ b/src/com/facebook/buck/dalvik/DalvikAwareZipSplitterFactory.java
@@ -44,6 +44,7 @@
         secondaryPattern,
         linearAllocLimit,
         requiredInPrimaryZip,
+        dexSplitStrategy,
         canaryStrategy,
         reportDir);
   }