From 1481ee28e0d4a56cf9408597ac169e0a3052423a Mon Sep 17 00:00:00 2001
From: Jas Strong <jasmine@electronpusher.org>
Date: Sun, 18 May 2014 15:22:49 -0700
Subject: [PATCH 1/2] Fix Android mode support  on MacOS X

The change in 2.2 to using the Oracle appbundler means that javac is no
longer available, and copying it in from outside leads to the Android
SDK utilities breaking (pre-dexing hangs, or javac hangs, or it builds
a broken Android apk that doesn't run.)
---
 build/build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 4d0f0b2335..abb3dce433 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -472,6 +472,14 @@
     <copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/lib/fonts">
       <fileset dir="shared/lib/fonts" includes="*" />
     </copy>
+	<copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/bin">
+	  <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/bin" includes="java,javac" />
+	</copy>
+	<copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/lib">
+	  <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/lib" includes="tools.jar" />
+	</copy>
+	<chmod perm="ugo+x" file="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/bin/java*" />
+	
 
     <antcall target="assemble">
       <param name="target.path" 

From 7bb612d3cc224f8e20d5d72087412118c216d64e Mon Sep 17 00:00:00 2001
From: Jas Strong <jasmine@electronpusher.org>
Date: Sun, 18 May 2014 15:35:35 -0700
Subject: [PATCH 2/2] 2.2 Toolkit changes broke many modes, inc Android

Stub out the setIcon(Frame f) method on Toolkit so that the four or
five modes that use it don't NoSuchMethodError on them.
---
 app/src/processing/app/Toolkit.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
index 3576217148..bef56759d2 100644
--- a/app/src/processing/app/Toolkit.java
+++ b/app/src/processing/app/Toolkit.java
@@ -182,7 +182,9 @@ static public void setIcon(Window window) {
     }
   }
 
-
+  static public void setIcon(java.awt.Frame frame) {
+	// do nothing; stub out to fix Modes that use this call.
+  }
   // someone needs to be slapped
   //static KeyStroke closeWindowKeyStroke;