Merge "Fix potential dex index overflow in dx" into lmp-mr1-dev

2 files changed, 7 insertions, 6 deletions

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index 36b9e2059..b9c6ec952 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -1731,15 +1731,15 @@ public class Main {
 
                 // Calculate max number of indices this class will add to the
                 // dex file.
-                // The constant pool contains at least one entry per method
-                // (name and signature), at least one entry per field (name
-                // and type), and at least per method/field reference (typed
-                // method ref).
+                // The possibility of overloading means that we can't easily
+                // know how many constant are needed for declared methods and
+                // fields. We therefore make the simplifying assumption that
+                // all constants are external method or field references.
 
                 int constantPoolSize = cf.getConstantPool().size();
-                maxMethodIdsInClass = constantPoolSize - cf.getFields().size()
+                maxMethodIdsInClass = constantPoolSize + cf.getMethods().size()
                         + MAX_METHOD_ADDED_DURING_DEX_CREATION;
-                maxFieldIdsInClass = constantPoolSize - cf.getMethods().size()
+                maxFieldIdsInClass = constantPoolSize + cf.getFields().size()
                         + MAX_FIELD_ADDED_DURING_DEX_CREATION;
                 synchronized(dexRotationLock) {
 
diff --git a/dx/tests/128-multidex-option-overflow/expected.txt b/dx/tests/128-multidex-option-overflow/expected.txt
index ac448a63d..3d7a649b8 100644
--- a/dx/tests/128-multidex-option-overflow/expected.txt
+++ b/dx/tests/128-multidex-option-overflow/expected.txt
@@ -1,2 +1,3 @@
 classes2.dex
+classes3.dex
 classes.dex