1 files changed, 12 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 042a0866e..ab6d2f788 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -77,12 +77,6 @@ import java.util.jar.Manifest;
  */
 public class Main {
     /**
-     * {@code non-null;} Error message for too many method/field/type ids.
-     */
-    public static final String TO_MANY_ID_ERROR_MESSAGE =
-        "Dex limit exceeded. You may try option " + Arguments.MULTI_DEX_OPTION;
-
-    /**
      * File extension of a {@code .dex} file.
      */
     private static final String DEX_EXTENSION = ".dex";
@@ -240,6 +234,18 @@ public class Main {
         }
     }
 
+    /**
+     * {@code non-null;} Error message for too many method/field/type ids.
+     */
+    public static String getTooManyIdsErrorMessage() {
+        if (args.multiDex) {
+            return "The list of classes given in " + Arguments.MAIN_DEX_LIST_OPTION +
+                   " is too big and does not fit in the main dex.";
+        } else {
+            return "You may try using " + Arguments.MULTI_DEX_OPTION + " option.";
+        }
+    }
+
     private static int runMonoDex() throws IOException {
 
         File incrementalOutFile = null;