diff --git a/.gitignore b/.gitignore
index 1c063354..9f89aae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,5 @@ loom/vendor/luajit/libluajit64.a
 loom/vendor/luajit/libluajit32.a
 output
 gems
+loom/engine/SDL2/platform/android/java/bin/
+loom/engine/SDL2/platform/android/java/gen/
diff --git a/application/android/src/co/theengine/loomdemo/LoomAdMob.java b/application/android/src/co/theengine/loomdemo/LoomAdMob.java
index 60aa8d05..2f44b3fb 100644
--- a/application/android/src/co/theengine/loomdemo/LoomAdMob.java
+++ b/application/android/src/co/theengine/loomdemo/LoomAdMob.java
@@ -11,8 +11,6 @@
 
 import com.google.ads.*;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  *  Java class that manages Admob instances. This maps directly to the platformAdMob C API
  */
@@ -26,8 +24,10 @@ private static void deferNativeCallback(String data, long callback, long payload
         final long fCallback = callback;
         final long fPayload  = payload;
         final int fType = type;
-
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+        
+        final Activity activity = LoomAdMob.activity;
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fData, fCallback, fPayload, fType);
diff --git a/application/android/src/co/theengine/loomdemo/LoomDemo.java b/application/android/src/co/theengine/loomdemo/LoomDemo.java
index bfaf89f9..2bad3611 100644
--- a/application/android/src/co/theengine/loomdemo/LoomDemo.java
+++ b/application/android/src/co/theengine/loomdemo/LoomDemo.java
@@ -23,11 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 package co.theengine.loomdemo;
 
-import org.cocos2dx.lib.Cocos2dxActivity;
-import org.cocos2dx.lib.Cocos2dxEditText;
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-import org.cocos2dx.lib.Cocos2dxRenderer;
-
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -62,14 +57,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 import com.dolby.DolbyAudio;
 
+import org.libsdl.app.SDLActivity;
 
-public class LoomDemo extends Cocos2dxActivity {
-
-    private Cocos2dxGLSurfaceView mGLView;
+public class LoomDemo extends SDLActivity {
 
     public static LoomDemo instance = null;
 
-
     public static String getMetadataString(Context context, String key) 
     {
         String metaString = null;
diff --git a/application/android/src/co/theengine/loomdemo/LoomFacebook.java b/application/android/src/co/theengine/loomdemo/LoomFacebook.java
index 01f97781..24622ef4 100644
--- a/application/android/src/co/theengine/loomdemo/LoomFacebook.java
+++ b/application/android/src/co/theengine/loomdemo/LoomFacebook.java
@@ -38,8 +38,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 // Loom.Facebook API
@@ -242,7 +240,8 @@ public void run()
     		            public void onComplete(Bundle values, FacebookException error) 
                         {
                             final boolean fSuccess = (error == null) ? true : false;
-                            Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                            // TODO: does this require queueEvent?
+                            activity.runOnUiThread(new Runnable() 
                             {
                                 @Override
                                 public void run() 
@@ -346,7 +345,8 @@ else if(exception instanceof FacebookServiceException)
             }
 
             final int fErrorCode = errorCode;
-			Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+            // TODO: does this require queueEvent?
+			activity.runOnUiThread(new Runnable() 
             {
 				@Override
 				public void run() 
diff --git a/application/android/src/co/theengine/loomdemo/LoomHTTP.java b/application/android/src/co/theengine/loomdemo/LoomHTTP.java
index 533aa225..8fbf9cfc 100644
--- a/application/android/src/co/theengine/loomdemo/LoomHTTP.java
+++ b/application/android/src/co/theengine/loomdemo/LoomHTTP.java
@@ -19,8 +19,6 @@
 
 import org.apache.http.entity.ByteArrayEntity;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 import android.util.Log;
 
 /**
@@ -97,7 +95,8 @@ public void onSuccess(byte[] binaryData) {
 
                 final String rfResponse = fResponse;
 
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         // Log.d(TAG, "Main view thread submitting '" + rfResponse + "'' from queue!");
@@ -135,7 +134,8 @@ public void onFailure(Throwable error, String content) {
 
                 Log.d("LoomHTTP", "Failed request with message: " + content);
 
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         LoomHTTP.onFailure(fContent, callback, payload);
@@ -157,7 +157,8 @@ else if(httpMethod.equals("POST"))
             }
             else
             {
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() 
                 {
                     @Override
                     public void run() {
@@ -169,7 +170,8 @@ public void run() {
         catch(Exception e)
         {
             Log.d("LoomHTTP", "Failed to make request due to: " + e.toString());
-            Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+            // TODO: does this require queueEvent?
+            activity.runOnUiThread(new Runnable() 
             {
                 @Override
                 public void run() {
diff --git a/application/android/src/co/theengine/loomdemo/LoomMobile.java b/application/android/src/co/theengine/loomdemo/LoomMobile.java
index e9effee3..aebd6d6c 100644
--- a/application/android/src/co/theengine/loomdemo/LoomMobile.java
+++ b/application/android/src/co/theengine/loomdemo/LoomMobile.java
@@ -10,8 +10,6 @@
 import android.provider.Settings.System;
 import android.net.Uri;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 /**
@@ -29,6 +27,7 @@ public class LoomMobile
 
     ///vars
     private static Activity     _context;
+    private static Activity     activity;
     private static Vibrator     _vibrator;
     private static boolean      _canVibrate;
     private static Uri          _customURI = null;
@@ -39,6 +38,7 @@ public class LoomMobile
     public static void onCreate(Activity ctx)
     {
         _context = ctx;
+        activity = LoomAdMob.activity;
 
         //vibration initialization
         _canVibrate = false;
@@ -80,7 +80,8 @@ public static void onCreate(Activity ctx)
             else
             {
                 //notify that we've launched via a custom URL
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() 
                 {
                     @Override
                     public void run() 
diff --git a/application/android/src/co/theengine/loomdemo/LoomSensors.java b/application/android/src/co/theengine/loomdemo/LoomSensors.java
index 2ea9f96e..5a7c1d8e 100644
--- a/application/android/src/co/theengine/loomdemo/LoomSensors.java
+++ b/application/android/src/co/theengine/loomdemo/LoomSensors.java
@@ -14,8 +14,6 @@
 import android.graphics.Matrix;
 import android.util.Log;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 
@@ -328,6 +326,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy)
     private static final String             TAG = "Loom Sensors";
 
     private static Context                  _context;
+    private static Activity                 activity;
     private static SensorManager            _sensorManager;
     private static int                      _naturalRotation;
     private static AndroidSensor[]          _sensorList;
@@ -338,6 +337,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy)
     public static void onCreate(Activity context)
     {
         _context = context;
+        activity = LoomAdMob.activity;
 
         //store sensor manager
         _sensorManager = (SensorManager)_context.getSystemService(Context.SENSOR_SERVICE);
@@ -468,7 +468,8 @@ private static void onRotationChanged(float x, float y, float z)
         final float fZ = z;
 
         ///make sure to call the delegate in the main thread
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 
@@ -486,7 +487,8 @@ private static void onGravityChanged(float x, float y, float z)
         final float fZ = z;
 
         ///make sure to call the delegate in the main thread
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 
diff --git a/application/android/src/co/theengine/loomdemo/LoomTeak.java b/application/android/src/co/theengine/loomdemo/LoomTeak.java
index 0eef28af..825f4f9a 100644
--- a/application/android/src/co/theengine/loomdemo/LoomTeak.java
+++ b/application/android/src/co/theengine/loomdemo/LoomTeak.java
@@ -1,5 +1,6 @@
 package co.theengine.loomdemo;
 
+import android.app.Activity;
 import android.util.Log;
 import android.os.Bundle;
 import android.content.Intent;
@@ -7,8 +8,6 @@
 
 import com.CarrotInc.Carrot.Carrot;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 public class LoomTeak 
 {
@@ -17,10 +16,12 @@ public class LoomTeak
 
     static Carrot mTeak = null;
 
+    protected static Activity activity;
 
 
     public static void onCreate(LoomDemo loomDemo, String facebookAppId) 
     {
+        activity = LoomAdMob.activity;
         if(mTeak == null) 
         {
             String teakKey = LoomDemo.getMetadataString(loomDemo, TEAK_SECRET_KEY);
@@ -36,7 +37,8 @@ public static void onCreate(LoomDemo loomDemo, String facebookAppId)
                     public void authenticationStatusChanged(int authStatus) 
                     {
                         final int _authStatus = authStatus;
-                        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                        // TODO: does this require queueEvent?
+                        activity.runOnUiThread(new Runnable() 
                         {
                             @Override
                             public void run() 
diff --git a/application/android/src/co/theengine/loomdemo/LoomVideo.java b/application/android/src/co/theengine/loomdemo/LoomVideo.java
index 42c05ba0..bad9f0af 100644
--- a/application/android/src/co/theengine/loomdemo/LoomVideo.java
+++ b/application/android/src/co/theengine/loomdemo/LoomVideo.java
@@ -14,6 +14,7 @@
 import android.view.ViewGroup;
 import android.view.MotionEvent;
 import android.view.View.OnTouchListener;
+import android.view.SurfaceView;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,9 +24,8 @@
 import android.view.KeyEvent;
 import android.graphics.Color;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
-
+import org.libsdl.app.SDLActivity;
+import org.libsdl.app.SDLActivity.SDLSurface;
 
 /**
  * Java Class that exposes Android fullscreen video playback
@@ -348,7 +348,8 @@ private static void cleanup()
         _rootView.setBackgroundColor(Color.TRANSPARENT);
 
         ///give focus back to the main surface view after we have removed the video view 
-        Cocos2dxGLSurfaceView.mainView.requestFocus();
+        // TODO: reimplement
+        //SDLActivity.getSurface().requestFocus();
     }
 
 
@@ -397,7 +398,8 @@ private static void deferNativeCallback(int type, String data)
         final int fType = type;
         final String fData = data;
 
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        _context.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 
diff --git a/application/android/src/co/theengine/loomdemo/LoomWebView.java b/application/android/src/co/theengine/loomdemo/LoomWebView.java
index 1f295f2e..b46f8185 100644
--- a/application/android/src/co/theengine/loomdemo/LoomWebView.java
+++ b/application/android/src/co/theengine/loomdemo/LoomWebView.java
@@ -12,8 +12,6 @@
 import android.webkit.WebChromeClient;
 import android.widget.RelativeLayout;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  *	Java class that manages WebView instances. This maps directly to the platformWebView C API
  */
@@ -28,7 +26,8 @@ private static void deferNativeCallback(String data, long callback, long payload
         final long fPayload = payload;
         final int fType = type;
 
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fData, fCallback, fPayload, fType);
diff --git a/application/android/src/co/theengine/loomdemo/billing/LoomStore.java b/application/android/src/co/theengine/loomdemo/billing/LoomStore.java
index 7628f14e..17bb8f09 100755
--- a/application/android/src/co/theengine/loomdemo/billing/LoomStore.java
+++ b/application/android/src/co/theengine/loomdemo/billing/LoomStore.java
@@ -21,8 +21,6 @@
 import android.os.RemoteException;
 import android.util.Log;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  * Provides Store functionality for Loom apps.
  * 
@@ -399,8 +397,8 @@ private static void deferNativeCallback(int type, String data)
     {
         final int fType = type;
         final String fData = data;
-
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+        // TODO: does this require queueEvent?
+        _activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fType, fData);
diff --git a/loom/common/platform/platformMobileAndroid.cpp b/loom/common/platform/platformMobileAndroid.cpp
index 21359fe7..fac300f3 100644
--- a/loom/common/platform/platformMobileAndroid.cpp
+++ b/loom/common/platform/platformMobileAndroid.cpp
@@ -20,8 +20,6 @@
 
 #include "loom/common/platform/platform.h"
 
-#define LOOM_PLATFORM LOOM_PLATFORM_ANDROID
-
 #if LOOM_PLATFORM == LOOM_PLATFORM_ANDROID
 
 #include <jni.h>
diff --git a/loom/engine/SDL2/platform/android/java/bin/SDLActivity-release-unsigned.apk b/loom/engine/SDL2/platform/android/java/bin/SDLActivity-release-unsigned.apk
deleted file mode 100644
index 7ad47793..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/SDLActivity-release-unsigned.apk and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/SDLActivity.ap_ b/loom/engine/SDL2/platform/android/java/bin/SDLActivity.ap_
deleted file mode 100644
index 1d2c1d96..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/SDLActivity.ap_ and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/build.prop b/loom/engine/SDL2/platform/android/java/bin/build.prop
deleted file mode 100644
index 6e2c5b97..00000000
--- a/loom/engine/SDL2/platform/android/java/bin/build.prop
+++ /dev/null
@@ -1,10 +0,0 @@
-#Last build type
-#Fri, 20 Mar 2015 02:38:32 +0100
-
-build.last.target=release
-
-build.last.is.instrumented=false
-
-build.last.is.packaging.debug=false
-
-build.last.is.signing.debug=false
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes.dex b/loom/engine/SDL2/platform/android/java/bin/classes.dex
deleted file mode 100644
index 21c66dfd..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes.dex and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/BuildConfig.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/BuildConfig.class
deleted file mode 100644
index 2eef4642..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/BuildConfig.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/DummyEdit.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/DummyEdit.class
deleted file mode 100644
index 72a0e4ac..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/DummyEdit.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$drawable.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$drawable.class
deleted file mode 100644
index bc9ff45c..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$drawable.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$layout.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$layout.class
deleted file mode 100644
index c4e86e85..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$layout.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$string.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$string.class
deleted file mode 100644
index 7014029b..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/R$string.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$3.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$3.class
deleted file mode 100644
index cdb49e24..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$3.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$4.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$4.class
deleted file mode 100644
index 3590aa27..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$4.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$5.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$5.class
deleted file mode 100644
index df93dfd3..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$5.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$6.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$6.class
deleted file mode 100644
index 6fde8301..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity$6.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity.class
deleted file mode 100644
index 6675cd5e..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLActivity.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class
deleted file mode 100644
index 92dd93d5..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLGenericMotionListener_API12.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLInputConnection.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLInputConnection.class
deleted file mode 100644
index f7717bc6..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLInputConnection.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler.class
deleted file mode 100644
index 35776aa9..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class
deleted file mode 100644
index f1dd909a..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$RangeComparator.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class
deleted file mode 100644
index e37828fa..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12$SDLJoystick.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class
deleted file mode 100644
index 72cb149a..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLJoystickHandler_API12.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLMain.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLMain.class
deleted file mode 100644
index 18055a38..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLMain.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface$1.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface$1.class
deleted file mode 100644
index ec6fb43f..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface$1.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface.class b/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface.class
deleted file mode 100644
index f4134d95..00000000
Binary files a/loom/engine/SDL2/platform/android/java/bin/classes/org/libsdl/app/SDLSurface.class and /dev/null differ
diff --git a/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/BuildConfig.java b/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/BuildConfig.java
deleted file mode 100644
index aa4fef9a..00000000
--- a/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.libsdl.app;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = false;
-}
\ No newline at end of file
diff --git a/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/R.java b/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/R.java
deleted file mode 100644
index f81ec24a..00000000
--- a/loom/engine/SDL2/platform/android/java/gen/org/libsdl/app/R.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.libsdl.app;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-    }
-}
diff --git a/loom/engine/SDL2/platform/android/java/project.properties b/loom/engine/SDL2/platform/android/java/project.properties
index c052cd8f..d5d17a95 100644
--- a/loom/engine/SDL2/platform/android/java/project.properties
+++ b/loom/engine/SDL2/platform/android/java/project.properties
@@ -10,5 +10,7 @@
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
+android.library=true
+
 # Project target.
 target=android-13
diff --git a/loom/engine/SDL2/platform/android/java/src/org/libsdl/app/SDLActivity.java b/loom/engine/SDL2/platform/android/java/src/org/libsdl/app/SDLActivity.java
index f65a0105..432a1780 100644
--- a/loom/engine/SDL2/platform/android/java/src/org/libsdl/app/SDLActivity.java
+++ b/loom/engine/SDL2/platform/android/java/src/org/libsdl/app/SDLActivity.java
@@ -526,6 +526,10 @@ public static Surface getNativeSurface() {
         return SDLActivity.mSurface.getNativeSurface();
     }
 
+    public static SDLSurface getSurface() {
+        return SDLActivity.mSurface;
+    }
+
     // Audio
 
     /**