Merge pull request processing#4406 from gohai/arm-export-memory

benfry · benfry · commit 79b45f30b4d6 · 2016-05-08T15:09:32.000-04:00
Ignore memory options when exporting for ARM
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -1123,7 +1123,11 @@ protected boolean exportApplication(File destFolder,
     /// figure out run options for the VM
 
     List<String> runOptions = new ArrayList<String>();
-    if (Preferences.getBoolean("run.options.memory")) {
+
+    // set memory options, except for ARM where we're more memory-constrained compared
+    // to the machine the user might be building the sketch on
+    if (Preferences.getBoolean("run.options.memory") &&
+        !exportVariant.equals("armv6hf")) {
       runOptions.add("-Xms" + Preferences.get("run.options.memory.initial") + "m");
       runOptions.add("-Xmx" + Preferences.get("run.options.memory.maximum") + "m");
     }
